From: Darrick J. Wong <darrick.wong@xxxxxxxxxx> Hide this function since it's internal to rdwr.c. Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> --- libxfs/libxfs_io.h | 7 ------- libxfs/rdwr.c | 21 ++++++--------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h index 7d96c2a3..32f8fde7 100644 --- a/libxfs/libxfs_io.h +++ b/libxfs/libxfs_io.h @@ -147,9 +147,6 @@ extern struct cache_operations libxfs_bcache_operations; #define libxfs_getbuf_map(dev, map, nmaps, flags) \ libxfs_trace_getbuf_map(__FUNCTION__, __FILE__, __LINE__, \ (dev), (map), (nmaps), (flags)) -#define libxfs_getbuf_flags(dev, daddr, len, flags) \ - libxfs_trace_getbuf_flags(__FUNCTION__, __FILE__, __LINE__, \ - (dev), (daddr), (len), (flags)) #define libxfs_buf_relse(buf) \ libxfs_trace_putbuf(__FUNCTION__, __FILE__, __LINE__, (buf)) @@ -166,8 +163,6 @@ struct xfs_buf *libxfs_trace_getbuf(const char *func, const char *file, size_t len); extern xfs_buf_t *libxfs_trace_getbuf_map(const char *, const char *, int, struct xfs_buftarg *, struct xfs_buf_map *, int, int); -extern xfs_buf_t *libxfs_trace_getbuf_flags(const char *, const char *, int, - struct xfs_buftarg *, xfs_daddr_t, int, unsigned int); extern void libxfs_trace_putbuf (const char *, const char *, int, xfs_buf_t *); @@ -178,8 +173,6 @@ extern xfs_buf_t *libxfs_readbuf_map(struct xfs_buftarg *, struct xfs_buf_map *, void libxfs_buf_dirty(struct xfs_buf *bp, int flags); extern xfs_buf_t *libxfs_getbuf_map(struct xfs_buftarg *, struct xfs_buf_map *, int, int); -extern xfs_buf_t *libxfs_getbuf_flags(struct xfs_buftarg *, xfs_daddr_t, - int, unsigned int); void libxfs_buf_relse(struct xfs_buf *); static inline struct xfs_buf* diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index bab70dfd..f46787a6 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -388,7 +388,6 @@ libxfs_log_header( #undef libxfs_readbuf_map #undef libxfs_writebuf #undef libxfs_getbuf_map -#undef libxfs_getbuf_flags xfs_buf_t *libxfs_readbuf_map(struct xfs_buftarg *, struct xfs_buf_map *, int, int, const struct xfs_buf_ops *); @@ -397,8 +396,6 @@ 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); -xfs_buf_t *libxfs_getbuf_flags(struct xfs_buftarg *, xfs_daddr_t, int, - unsigned int); void libxfs_buf_relse(struct xfs_buf *); #define __add_trace(bp, func, file, line) \ @@ -468,15 +465,6 @@ libxfs_trace_getbuf_map(const char *func, const char *file, int line, return bp; } -xfs_buf_t * -libxfs_trace_getbuf_flags(const char *func, const char *file, int line, - struct xfs_buftarg *btp, xfs_daddr_t blkno, int len, unsigned int flags) -{ - xfs_buf_t *bp = libxfs_getbuf_flags(btp, blkno, len, flags); - __add_trace(bp, func, file, line); - return bp; -} - void libxfs_trace_putbuf(const char *func, const char *file, int line, xfs_buf_t *bp) { @@ -780,9 +768,12 @@ __cache_lookup(struct xfs_bufkey *key, unsigned int flags) return NULL; } -struct xfs_buf * -libxfs_getbuf_flags(struct xfs_buftarg *btp, xfs_daddr_t blkno, int len, - unsigned int flags) +static struct xfs_buf * +libxfs_getbuf_flags( + struct xfs_buftarg *btp, + xfs_daddr_t blkno, + int len, + unsigned int flags) { struct xfs_bufkey key = {NULL};