libxfs: rename libxfs_getbuf_map to libxfs_buf_get_map

Rename this function to match the kernel function.

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/libxfs_io.h b/libxfs/libxfs_io.h
index 62b09205c9c59af88606b12eb45710070aa8f45f..957f0396a9cecd3c5656cb9062b187e2e9b30ad9 100644 (file)
--- a/libxfs/libxfs_io.h
+++ b/libxfs/libxfs_io.h
@@ -141,7 +141,7 @@ extern struct cache_operations      libxfs_bcache_operations;
 #define libxfs_buf_get(dev, daddr, len) \
        libxfs_trace_getbuf(__FUNCTION__, __FILE__, __LINE__, \
                            (dev), (daddr), (len))
-#define libxfs_getbuf_map(dev, map, nmaps, flags) \
+#define libxfs_buf_get_map(dev, map, nmaps, flags) \
        libxfs_trace_getbuf_map(__FUNCTION__, __FILE__, __LINE__, \
                            (dev), (map), (nmaps), (flags))
 #define libxfs_buf_relse(buf) \
@@ -169,8 +169,8 @@ struct xfs_buf *libxfs_buf_read_map(struct xfs_buftarg *btp,
                        struct xfs_buf_map *map, int nmaps, int flags,
                        const struct xfs_buf_ops *ops);
 void libxfs_buf_mark_dirty(struct xfs_buf *bp);
-extern xfs_buf_t *libxfs_getbuf_map(struct xfs_buftarg *,
-                       struct xfs_buf_map *, int, int);
+struct xfs_buf *libxfs_buf_get_map(struct xfs_buftarg *btp,
+                       struct xfs_buf_map *map, int nmaps, int flags);
 void   libxfs_buf_relse(struct xfs_buf *bp);
 
 static inline struct xfs_buf*
@@ -181,7 +181,7 @@ libxfs_buf_get(
 {
        DEFINE_SINGLE_BUF_MAP(map, blkno, numblks);
 
-       return libxfs_getbuf_map(target, &map, 1, 0);
+       return libxfs_buf_get_map(target, &map, 1, 0);
 }
 
 static inline struct xfs_buf*

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 2a96646b939a548138b69c4be8012e59c5f221ff..79d7458361348b882397399d37e61833101df069 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -156,7 +156,7 @@ static char *next(
 
 #undef libxfs_buf_read_map
 #undef libxfs_writebuf
-#undef libxfs_getbuf_map
+#undef libxfs_buf_get_map
 
 struct xfs_buf *libxfs_buf_read_map(struct xfs_buftarg *btp,
                        struct xfs_buf_map *map, int nmaps, int flags,
@@ -164,8 +164,8 @@ struct xfs_buf      *libxfs_buf_read_map(struct xfs_buftarg *btp,
 int            libxfs_writebuf(xfs_buf_t *, int);
 struct xfs_buf *libxfs_buf_get(struct xfs_buftarg *btp, xfs_daddr_t daddr,
                                size_t len);
-xfs_buf_t      *libxfs_getbuf_map(struct xfs_buftarg *, struct xfs_buf_map *,
-                               int, int);
+struct xfs_buf *libxfs_buf_get_map(struct xfs_buftarg *btp,
+                       struct xfs_buf_map *map, int nmaps, int flags);
 void           libxfs_buf_relse(struct xfs_buf *bp);
 
 #define        __add_trace(bp, func, file, line)       \
@@ -219,7 +219,7 @@ libxfs_trace_getbuf(
        struct xfs_buf          *bp;
        DEFINE_SINGLE_BUF_MAP(map, blkno, numblks);
 
-       bp = libxfs_getbuf_map(target, &map, 1, 0);
+       bp = libxfs_buf_get_map(target, &map, 1, 0);
        __add_trace(bp, func, file, line);
        return bp;
 }
@@ -229,7 +229,7 @@ libxfs_trace_getbuf_map(const char *func, const char *file, int line,
                struct xfs_buftarg *btp, struct xfs_buf_map *map, int nmaps,
                int flags)
 {
-       xfs_buf_t       *bp = libxfs_getbuf_map(btp, map, nmaps, flags);
+       xfs_buf_t       *bp = libxfs_buf_get_map(btp, map, nmaps, flags);
        __add_trace(bp, func, file, line);
        return bp;
 }
@@ -575,7 +575,7 @@ reset_buf_state(
 }
 
 static struct xfs_buf *
-__libxfs_getbuf_map(struct xfs_buftarg *btp, struct xfs_buf_map *map,
+__libxfs_buf_get_map(struct xfs_buftarg *btp, struct xfs_buf_map *map,
                    int nmaps, int flags)
 {
        struct xfs_bufkey key = {NULL};
@@ -597,12 +597,12 @@ __libxfs_getbuf_map(struct xfs_buftarg *btp, struct xfs_buf_map *map,
 }
 
 struct xfs_buf *
-libxfs_getbuf_map(struct xfs_buftarg *btp, struct xfs_buf_map *map,
+libxfs_buf_get_map(struct xfs_buftarg *btp, struct xfs_buf_map *map,
                  int nmaps, int flags)
 {
        struct xfs_buf  *bp;
 
-       bp = __libxfs_getbuf_map(btp, map, nmaps, flags);
+       bp = __libxfs_buf_get_map(btp, map, nmaps, flags);
        reset_buf_state(bp);
        return bp;
 }
@@ -807,7 +807,7 @@ libxfs_buf_read_map(struct xfs_buftarg *btp, struct xfs_buf_map *map, int nmaps,
                return libxfs_readbuf(btp, map[0].bm_bn, map[0].bm_len,
                                        flags, ops);
 
-       bp = __libxfs_getbuf_map(btp, map, nmaps, 0);
+       bp = __libxfs_buf_get_map(btp, map, nmaps, 0);
        if (!bp)
                return NULL;
 

diff --git a/libxfs/trans.c b/libxfs/trans.c
index ebdc73d5dd02a1f1d81ed1bf8c37e8bddf384d53..b78bca865bfcebc4de12b5ac394d8d8c28f89ca1 100644 (file)
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -427,7 +427,7 @@ libxfs_trans_get_buf_map(
        struct xfs_buf_log_item *bip;
 
        if (!tp)
-               return libxfs_getbuf_map(target, map, nmaps, 0);
+               return libxfs_buf_get_map(target, map, nmaps, 0);
 
        /*
         * If we find the buffer in the cache with this transaction
@@ -445,7 +445,7 @@ libxfs_trans_get_buf_map(
                return bp;
        }
 
-       bp = libxfs_getbuf_map(target, map, nmaps, 0);
+       bp = libxfs_buf_get_map(target, map, nmaps, 0);
        if (bp == NULL) {
                return NULL;
        }

diff --git a/repair/prefetch.c b/repair/prefetch.c
index a3858f9abbd967aa539e77e9021ce74c7f5afae7..7f705cc07aa52859a9e94c9d387a04d43bf4081f 100644 (file)
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -120,7 +120,7 @@ pf_queue_io(
         * the lock holder is either reading it from disk himself or
         * completely overwriting it this behaviour is perfectly fine.
         */
-       bp = libxfs_getbuf_map(mp->m_dev, map, nmaps, LIBXFS_GETBUF_TRYLOCK);
+       bp = libxfs_buf_get_map(mp->m_dev, map, nmaps, LIBXFS_GETBUF_TRYLOCK);
        if (!bp)
                return;