aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2011-10-10 12:52:52 -0400
committerAlex Elder <aelder@sgi.com>2011-10-11 22:15:11 -0400
commita9add83e5abd29bf2b7b3658311199eeabbdefc6 (patch)
tree0219f5fad2baac905366ca559001f39c3ca90ed4 /fs
parent02b102df1502a7ea4167d115510e1e8fe6467f12 (diff)
xfs: remove XFS_bflush
Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_buf.h2
-rw-r--r--fs/xfs/xfs_log_recover.c2
-rw-r--r--fs/xfs/xfs_mount.c2
-rw-r--r--fs/xfs/xfs_qm.c2
-rw-r--r--fs/xfs/xfs_super.c4
-rw-r--r--fs/xfs/xfs_sync.c2
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);
294#define xfs_getsize_buftarg(buftarg) block_size((buftarg)->bt_bdev) 294#define xfs_getsize_buftarg(buftarg) block_size((buftarg)->bt_bdev)
295#define xfs_readonly_buftarg(buftarg) bdev_read_only((buftarg)->bt_bdev) 295#define xfs_readonly_buftarg(buftarg) bdev_read_only((buftarg)->bt_bdev)
296 296
297#define XFS_bflush(buftarg) xfs_flush_buftarg(buftarg, 1)
298
299#endif /* __XFS_BUF_H__ */ 297#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(
3654 return error; 3654 return error;
3655 } 3655 }
3656 3656
3657 XFS_bflush(log->l_mp->m_ddev_targp); 3657 xfs_flush_buftarg(log->l_mp->m_ddev_targp, 1);
3658 3658
3659 /* 3659 /*
3660 * If IO errors happened during recovery, bail out. 3660 * 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(
1481 * state as much as possible. 1481 * state as much as possible.
1482 */ 1482 */
1483 xfs_reclaim_inodes(mp, 0); 1483 xfs_reclaim_inodes(mp, 0);
1484 XFS_bflush(mp->m_ddev_targp); 1484 xfs_flush_buftarg(mp->m_ddev_targp, 1);
1485 xfs_reclaim_inodes(mp, SYNC_WAIT); 1485 xfs_reclaim_inodes(mp, SYNC_WAIT);
1486 1486
1487 xfs_qm_unmount(mp); 1487 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(
1681 * quotacheck'd stamp on the superblock. So, here we do a synchronous 1681 * quotacheck'd stamp on the superblock. So, here we do a synchronous
1682 * flush. 1682 * flush.
1683 */ 1683 */
1684 XFS_bflush(mp->m_ddev_targp); 1684 xfs_flush_buftarg(mp->m_ddev_targp, 1);
1685 1685
1686 /* 1686 /*
1687 * If one type of quotas is off, then it will lose its 1687 * 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(
1015 */ 1015 */
1016 xfs_filestream_unmount(mp); 1016 xfs_filestream_unmount(mp);
1017 1017
1018 XFS_bflush(mp->m_ddev_targp); 1018 xfs_flush_buftarg(mp->m_ddev_targp, 1);
1019 1019
1020 xfs_unmountfs(mp); 1020 xfs_unmountfs(mp);
1021 xfs_freesb(mp); 1021 xfs_freesb(mp);
@@ -1439,7 +1439,7 @@ xfs_fs_fill_super(
1439 */ 1439 */
1440 xfs_filestream_unmount(mp); 1440 xfs_filestream_unmount(mp);
1441 1441
1442 XFS_bflush(mp->m_ddev_targp); 1442 xfs_flush_buftarg(mp->m_ddev_targp, 1);
1443 1443
1444 xfs_unmountfs(mp); 1444 xfs_unmountfs(mp);
1445 goto out_free_sb; 1445 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(
377 377
378 /* flush data-only devices */ 378 /* flush data-only devices */
379 if (mp->m_rtdev_targp) 379 if (mp->m_rtdev_targp)
380 XFS_bflush(mp->m_rtdev_targp); 380 xfs_flush_buftarg(mp->m_rtdev_targp, 1);
381 381
382 return error ? error : error2; 382 return error ? error : error2;
383} 383}