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 871abaabff3d6607a53602a95e545c88010e17da..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);
 }
 
 /*
@@ -902,12 +904,13 @@ xfs_buf_read_uncached(
        const struct xfs_buf_ops *ops)
 {
        struct xfs_buf          *bp;
+       int                     error;
 
        *bpp = NULL;
 
-       bp = xfs_buf_get_uncached(target, numblks, flags);
-       if (!bp)
-               return -ENOMEM;
+       error = xfs_buf_get_uncached(target, numblks, flags, &bp);
+       if (error)
+               return error;
 
        /* set up the buffer for a read IO */
        ASSERT(bp->b_map_count == 1);
@@ -918,7 +921,7 @@ xfs_buf_read_uncached(
 
        xfs_buf_submit(bp);
        if (bp->b_error) {
-               int     error = bp->b_error;
+               error = bp->b_error;
                xfs_buf_relse(bp);
                return error;
        }
@@ -927,17 +930,20 @@ xfs_buf_read_uncached(
        return 0;
 }
 
-xfs_buf_t *
+int
 xfs_buf_get_uncached(
        struct xfs_buftarg      *target,
        size_t                  numblks,
-       int                     flags)
+       int                     flags,
+       struct xfs_buf          **bpp)
 {
        unsigned long           page_count;
        int                     error, i;
        struct xfs_buf          *bp;
        DEFINE_SINGLE_BUF_MAP(map, XFS_BUF_DADDR_NULL, numblks);
 
+       *bpp = NULL;
+
        /* flags might contain irrelevant bits, pass only what we care about */
        error = _xfs_buf_alloc(target, &map, 1, flags & XBF_NO_IOACCT, &bp);
        if (error)
@@ -950,8 +956,10 @@ xfs_buf_get_uncached(
 
        for (i = 0; i < page_count; i++) {
                bp->b_pages[i] = alloc_page(xb_to_gfp(flags));
-               if (!bp->b_pages[i])
+               if (!bp->b_pages[i]) {
+                       error = -ENOMEM;
                        goto fail_free_mem;
+               }
        }
        bp->b_flags |= _XBF_PAGES;
 
@@ -963,7 +971,8 @@ xfs_buf_get_uncached(
        }
 
        trace_xfs_buf_get_uncached(bp, _RET_IP_);
-       return bp;
+       *bpp = bp;
+       return 0;
 
  fail_free_mem:
        while (--i >= 0)
@@ -973,7 +982,7 @@ xfs_buf_get_uncached(
        xfs_buf_free_maps(bp);
        kmem_cache_free(xfs_buf_zone, bp);
  fail:
-       return NULL;
+       return error;
 }
 
 /*
@@ -1227,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);
 }