Merge tag 'docs-5.6-2' of git://git.lwn.net/linux

[linux.git] / fs / xfs / xfs_buf.c

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index b420e865b32edbc8edb85464b0b66eadac80c1d6..217e4f82a44a2601351c8e46f7503512b9a5cc31 100644 (file)
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -803,7 +803,8 @@ xfs_buf_read_map(
        int                     nmaps,
        xfs_buf_flags_t         flags,
        struct xfs_buf          **bpp,
-       const struct xfs_buf_ops *ops)
+       const struct xfs_buf_ops *ops,
+       xfs_failaddr_t          fa)
 {
        struct xfs_buf          *bp;
        int                     error;
@@ -852,7 +853,7 @@ xfs_buf_read_map(
         */
        if (error) {
                if (!XFS_FORCED_SHUTDOWN(target->bt_mount))
-                       xfs_buf_ioerror_alert(bp, __func__);
+                       xfs_buf_ioerror_alert(bp, fa);
 
                bp->b_flags &= ~XBF_DONE;
                xfs_buf_stale(bp);
@@ -885,7 +886,8 @@ xfs_buf_readahead_map(
                return;
 
        xfs_buf_read_map(target, map, nmaps,
-                    XBF_TRYLOCK | XBF_ASYNC | XBF_READ_AHEAD, &bp, ops);
+                    XBF_TRYLOCK | XBF_ASYNC | XBF_READ_AHEAD, &bp, ops,
+                    __this_address);
 }
 
 /*
@@ -1234,10 +1236,10 @@ __xfs_buf_ioerror(
 void
 xfs_buf_ioerror_alert(
        struct xfs_buf          *bp,
-       const char              *func)
+       xfs_failaddr_t          func)
 {
        xfs_alert(bp->b_mount,
-"metadata I/O error in \"%s\" at daddr 0x%llx len %d error %d",
+"metadata I/O error in \"%pS\" at daddr 0x%llx len %d error %d",
                        func, (uint64_t)XFS_BUF_ADDR(bp), bp->b_length,
                        -bp->b_error);
 }