[PATCH 10/11] xfs: remove XFS_bflush

[Christoph Hellwig <hch@xxxxxxxxxxxxx>]

Signed-off-by: Christoph Hellwig <hch@xxxxxx>

Index: xfs/fs/xfs/xfs_buf.h
===================================================================
--- xfs.orig/fs/xfs/xfs_buf.h   2011-10-07 10:29:09.453018618 -0400
+++ xfs/fs/xfs/xfs_buf.h        2011-10-07 10:29:10.925017534 -0400
@@ -294,6 +294,4 @@ extern int xfs_flush_buftarg(xfs_buftarg
 #define xfs_getsize_buftarg(buftarg)   block_size((buftarg)->bt_bdev)
 #define xfs_readonly_buftarg(buftarg)  bdev_read_only((buftarg)->bt_bdev)
 
-#define XFS_bflush(buftarg)            xfs_flush_buftarg(buftarg, 1)
-
 #endif /* __XFS_BUF_H__ */
Index: xfs/fs/xfs/xfs_log_recover.c
===================================================================
--- xfs.orig/fs/xfs/xfs_log_recover.c   2011-10-07 10:25:55.480875753 -0400
+++ xfs/fs/xfs/xfs_log_recover.c        2011-10-07 10:29:10.929019399 -0400
@@ -3654,7 +3654,7 @@ xlog_do_recover(
                return error;
        }
 
-       XFS_bflush(log->l_mp->m_ddev_targp);
+       xfs_flush_buftarg(log->l_mp->m_ddev_targp, 1);
 
        /*
         * If IO errors happened during recovery, bail out.
Index: xfs/fs/xfs/xfs_mount.c
===================================================================
--- xfs.orig/fs/xfs/xfs_mount.c 2011-10-07 10:25:59.917017490 -0400
+++ xfs/fs/xfs/xfs_mount.c      2011-10-07 10:29:10.933016765 -0400
@@ -1481,7 +1481,7 @@ xfs_unmountfs(
         * state as much as possible.
         */
        xfs_reclaim_inodes(mp, 0);
-       XFS_bflush(mp->m_ddev_targp);
+       xfs_flush_buftarg(mp->m_ddev_targp, 1);
        xfs_reclaim_inodes(mp, SYNC_WAIT);
 
        xfs_qm_unmount(mp);
Index: xfs/fs/xfs/xfs_qm.c
===================================================================
--- xfs.orig/fs/xfs/xfs_qm.c    2011-10-07 10:20:36.768517710 -0400
+++ xfs/fs/xfs/xfs_qm.c 2011-10-07 10:29:10.933016765 -0400
@@ -1681,7 +1681,7 @@ xfs_qm_quotacheck(
         * quotacheck'd stamp on the superblock. So, here we do a synchronous
         * flush.
         */
-       XFS_bflush(mp->m_ddev_targp);
+       xfs_flush_buftarg(mp->m_ddev_targp, 1);
 
        /*
         * If one type of quotas is off, then it will lose its
Index: xfs/fs/xfs/xfs_super.c
===================================================================
--- xfs.orig/fs/xfs/xfs_super.c 2011-10-07 10:20:36.780519685 -0400
+++ xfs/fs/xfs/xfs_super.c      2011-10-07 10:29:10.941016441 -0400
@@ -1015,7 +1015,7 @@ xfs_fs_put_super(
         */
        xfs_filestream_unmount(mp);
 
-       XFS_bflush(mp->m_ddev_targp);
+       xfs_flush_buftarg(mp->m_ddev_targp, 1);
 
        xfs_unmountfs(mp);
        xfs_freesb(mp);
@@ -1439,7 +1439,7 @@ xfs_fs_fill_super(
         */
        xfs_filestream_unmount(mp);
 
-       XFS_bflush(mp->m_ddev_targp);
+       xfs_flush_buftarg(mp->m_ddev_targp, 1);
 
        xfs_unmountfs(mp);
        goto out_free_sb;
Index: xfs/fs/xfs/xfs_sync.c
===================================================================
--- xfs.orig/fs/xfs/xfs_sync.c  2011-10-07 10:20:36.796516946 -0400
+++ xfs/fs/xfs/xfs_sync.c       2011-10-07 10:29:10.949016598 -0400
@@ -377,7 +377,7 @@ xfs_quiesce_data(
 
        /* flush data-only devices */
        if (mp->m_rtdev_targp)
-               XFS_bflush(mp->m_rtdev_targp);
+               xfs_flush_buftarg(mp->m_rtdev_targp, 1);
 
        return error ? error : error2;
 }