aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_mount.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-01-19 04:56:46 -0500
committerAlex Elder <aelder@sgi.com>2010-01-21 14:44:49 -0500
commita14a348bff2f99471a28e5928eb6801224c053d8 (patch)
tree9a34d7e988cd78bc9b19369cbad3ad009b9a2bfd /fs/xfs/xfs_mount.c
parent4139b3b337cffd106744386c842b89dc86e31d4b (diff)
xfs: cleanup up xfs_log_force calling conventions
Remove the XFS_LOG_FORCE argument which was always set, and the XFS_LOG_URGE define, which was never used. Split xfs_log_force into a two helpers - xfs_log_force which forces the whole log, and xfs_log_force_lsn which forces up to the specified LSN. The underlying implementations already were entirely separate, as were the users. Also re-indent the new _xfs_log_force/_xfs_log_force which previously had a weird coding style. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_mount.c')
-rw-r--r--fs/xfs/xfs_mount.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index bb0154047e85..7f81ed72c875 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1455,7 +1455,7 @@ xfs_unmountfs(
1455 * push out the iclog we will never get that unlocked. hence we 1455 * push out the iclog we will never get that unlocked. hence we
1456 * need to force the log first. 1456 * need to force the log first.
1457 */ 1457 */
1458 xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE | XFS_LOG_SYNC); 1458 xfs_log_force(mp, XFS_LOG_SYNC);
1459 xfs_reclaim_inodes(mp, XFS_IFLUSH_ASYNC); 1459 xfs_reclaim_inodes(mp, XFS_IFLUSH_ASYNC);
1460 1460
1461 xfs_qm_unmount(mp); 1461 xfs_qm_unmount(mp);
@@ -1465,7 +1465,7 @@ xfs_unmountfs(
1465 * that nothing is pinned. This is important because bflush() 1465 * that nothing is pinned. This is important because bflush()
1466 * will skip pinned buffers. 1466 * will skip pinned buffers.
1467 */ 1467 */
1468 xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE | XFS_LOG_SYNC); 1468 xfs_log_force(mp, XFS_LOG_SYNC);
1469 1469
1470 xfs_binval(mp->m_ddev_targp); 1470 xfs_binval(mp->m_ddev_targp);
1471 if (mp->m_rtdev_targp) { 1471 if (mp->m_rtdev_targp) {