libxfs: hide libxfs_getbuf_flags

Hide this function since it's internal to rdwr.c.

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 c69eea97644a94337dc65cb8c55f7cc41cb47d35..7f513d86212ba9b6ef891983ded66e3dd2df0ce5 100644 (file)
--- a/libxfs/libxfs_io.h
+++ b/libxfs/libxfs_io.h
@@ -144,9 +144,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))
 
@@ -163,8 +160,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 *);
 
@@ -175,8 +170,6 @@ extern xfs_buf_t *libxfs_readbuf_map(struct xfs_buftarg *, struct xfs_buf_map *,
 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);
-extern xfs_buf_t *libxfs_getbuf_flags(struct xfs_buftarg *, xfs_daddr_t,
-                       int, unsigned int);
 void   libxfs_buf_relse(struct xfs_buf *bp);
 
 static inline struct xfs_buf*

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 82f15af9d5d6df65cc5629e84f801bcbba270f97..549fe3c1f5f123554dfa4fc0074fad9b4651efe4 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -157,7 +157,6 @@ static char *next(
 #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 *);
@@ -166,8 +165,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 *bp);
 
 #define        __add_trace(bp, func, file, line)       \
@@ -236,15 +233,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)
 {
@@ -549,9 +537,12 @@ out_put:
        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};