Skip to content

Commit

Permalink
xfs: remove XFS_bflush
Browse files Browse the repository at this point in the history
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
  • Loading branch information
Christoph Hellwig authored and Alex Elder committed Oct 12, 2011
1 parent 02b102d commit a9add83
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 8 deletions.
2 changes: 0 additions & 2 deletions fs/xfs/xfs_buf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__ */
2 changes: 1 addition & 1 deletion fs/xfs/xfs_log_recover.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion fs/xfs/xfs_mount.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion fs/xfs/xfs_qm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions fs/xfs/xfs_super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fs/xfs/xfs_sync.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit a9add83

Please sign in to comment.