libxfs: rename libxfs_writebufr to libxfs_bwrite

Rename this function so that we have an API that matches the kernel
without a #define.

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/db/io.c b/db/io.c
index 163ccc89326140cbafa1ff139a37bdff309a41eb..7c7a46242fda55de2a706961221a1ea432bd7b45 100644 (file)
--- a/db/io.c
+++ b/db/io.c
@@ -426,7 +426,7 @@ write_cur_buf(void)
 {
        int ret;
 
-       ret = -libxfs_writebufr(iocur_top->bp);
+       ret = -libxfs_bwrite(iocur_top->bp);
        if (ret != 0)
                dbprintf(_("write error: %s\n"), strerror(ret));
 
@@ -442,7 +442,7 @@ write_cur_bbs(void)
 {
        int ret;
 
-       ret = -libxfs_writebufr(iocur_top->bp);
+       ret = -libxfs_bwrite(iocur_top->bp);
        if (ret != 0)
                dbprintf(_("write error: %s\n"), strerror(ret));
 

diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index 57cf5f8312e675000bb283976b3a601826b3c19c..df267c98a21c333066045437bc712499d4f92ac7 100644 (file)
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -48,6 +48,7 @@
 #define xfs_buf_read                   libxfs_buf_read
 #define xfs_buf_relse                  libxfs_buf_relse
 #define xfs_bunmapi                    libxfs_bunmapi
+#define xfs_bwrite                     libxfs_bwrite
 #define xfs_calc_dquots_per_chunk      libxfs_calc_dquots_per_chunk
 #define xfs_da3_node_hdr_from_disk     libxfs_da3_node_hdr_from_disk
 #define xfs_da_get_buf                 libxfs_da_get_buf

diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h
index 1b8318af9bfca80084d2c6d343ac7b536b84eabd..0370d685e21d70dacb140a36cdc3c32322534d2e 100644 (file)
--- a/libxfs/libxfs_io.h
+++ b/libxfs/libxfs_io.h
@@ -220,7 +220,7 @@ extern xfs_buf_t *libxfs_getbufr(struct xfs_buftarg *, xfs_daddr_t, int);
 extern void    libxfs_putbufr(xfs_buf_t *);
 
 extern int     libxfs_writebuf_int(xfs_buf_t *, int);
-extern int     libxfs_writebufr(struct xfs_buf *);
+int            libxfs_bwrite(struct xfs_buf *bp);
 extern int     libxfs_readbufr(struct xfs_buftarg *, xfs_daddr_t, xfs_buf_t *, int, int);
 extern int     libxfs_readbufr_map(struct xfs_buftarg *, struct xfs_buf *, int);
 

diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 0f26120fca1b8e3490ec8e8a2b9bab4e87e37c09..5d6dd06339d74bf0ea31ddb38c0dc638f29c11f1 100644 (file)
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -377,7 +377,6 @@ roundup_64(uint64_t x, uint32_t y)
        (len) = __bar; /* no set-but-unused warning */  \
        NULL;                                           \
 })
-#define xfs_bwrite(bp)                 libxfs_writebuf((bp), 0)
 #define xfs_buf_oneshot(bp)            ((void) 0)
 
 #define XBRW_READ                      LIBXFS_BREAD

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 7b91ebf6863e47910923833ad1955a6bb6a24f79..bbec1135c4b77e424001b617e1c0b1c81559dc84 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -1090,9 +1090,10 @@ __write_buf(int fd, void *buf, int len, off64_t offset, int flags)
 }
 
 int
-libxfs_writebufr(xfs_buf_t *bp)
+libxfs_bwrite(
+       struct xfs_buf  *bp)
 {
-       int     fd = libxfs_device_to_fd(bp->b_target->dev);
+       int             fd = libxfs_device_to_fd(bp->b_target->dev);
 
        /*
         * we never write buffers that are marked stale. This indicates they
@@ -1301,7 +1302,7 @@ libxfs_bflush(
        struct xfs_buf          *bp = (struct xfs_buf *)node;
 
        if (!bp->b_error && bp->b_flags & LIBXFS_B_DIRTY)
-               return libxfs_writebufr(bp);
+               return libxfs_bwrite(bp);
        return bp->b_error;
 }
 
@@ -1309,7 +1310,7 @@ void
 libxfs_putbufr(xfs_buf_t *bp)
 {
        if (bp->b_flags & LIBXFS_B_DIRTY)
-               libxfs_writebufr(bp);
+               libxfs_bwrite(bp);
        libxfs_brelse((struct cache_node *)bp);
 }
 
@@ -1522,7 +1523,7 @@ xfs_buf_delwri_submit(
 
        list_for_each_entry_safe(bp, n, buffer_list, b_list) {
                list_del_init(&bp->b_list);
-               error2 = libxfs_writebufr(bp);
+               error2 = libxfs_bwrite(bp);
                if (!error)
                        error = error2;
                libxfs_buf_relse(bp);