@@ -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));
@@ -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
@@ -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);
@@ -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
@@ -1083,9 +1083,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
@@ -1294,7 +1295,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;
}
@@ -1302,7 +1303,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);
}
@@ -1515,7 +1516,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);