6 files changed, 6 insertions, 8 deletions

diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
index be19dd2b0212..5bab046e859f 100644
--- a/fs/xfs/xfs_buf.h
+++ b/fs/xfs/xfs_buf.h
@@ -294,6 +294,4 @@ extern int xfs_flush_buftarg(xfs_buftarg_t *, int);
 #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__ */
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 82ee9db628ed..541a508adea1 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -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.
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index f3b1cec38b81..d06afbc3540d 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -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);
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index ddaf97a57ec6..5cff443f6cdb 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -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
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 6ad05e68abda..ba16248bcf24 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -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;
diff --git a/fs/xfs/xfs_sync.c b/fs/xfs/xfs_sync.c
index bf2b38c21caa..aa3dc1a4d53d 100644
--- a/fs/xfs/xfs_sync.c
+++ b/fs/xfs/xfs_sync.c
@@ -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;
 }