libxfs: make libxfs_getbuf_flags return an error code

Convert libxfs_getbuf_flags() to return numeric error codes like most
everywhere else in xfsprogs.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 60fd042c6a6f67317341dc2181b6b94ea4ea2c3e..c102f124abe6f28d21f4098bd30d8ee8d07e2771 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -545,25 +545,21 @@ __cache_lookup(
        return 0;
 }
 
-static struct xfs_buf *
+static int
 libxfs_getbuf_flags(
        struct xfs_buftarg      *btp,
        xfs_daddr_t             blkno,
        int                     len,
-       unsigned int            flags)
+       unsigned int            flags,
+       struct xfs_buf          **bpp)
 {
        struct xfs_bufkey       key = {NULL};
-       struct xfs_buf          *bp;
-       int                     error;
 
        key.buftarg = btp;
        key.blkno = blkno;
        key.bblen = len;
 
-       error = __cache_lookup(&key, flags, &bp);
-       if (error)
-               return NULL;
-       return bp;
+       return __cache_lookup(&key, flags, bpp);
 }
 
 /*
@@ -598,9 +594,13 @@ __libxfs_buf_get_map(
        int                     i;
        int                     error;
 
-       if (nmaps == 1)
-               return libxfs_getbuf_flags(btp, map[0].bm_bn, map[0].bm_len,
-                                          flags);
+       if (nmaps == 1) {
+               error = libxfs_getbuf_flags(btp, map[0].bm_bn, map[0].bm_len,
+                               flags, &bp);
+               if (error)
+                       return NULL;
+               return bp;
+       }
 
        key.buftarg = btp;
        key.blkno = map[0].bm_bn;
@@ -748,8 +748,8 @@ libxfs_readbuf(
        struct xfs_buf          *bp;
        int                     error;
 
-       bp = libxfs_getbuf_flags(btp, blkno, len, 0);
-       if (!bp)
+       error = libxfs_getbuf_flags(btp, blkno, len, 0, &bp);
+       if (error)
                return NULL;
 
        /*