aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_sync.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/xfs_sync.c')
-rw-r--r--fs/xfs/xfs_sync.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/xfs/xfs_sync.c b/fs/xfs/xfs_sync.c
index be5c51d8f75..5b9ec37a3e0 100644
--- a/fs/xfs/xfs_sync.c
+++ b/fs/xfs/xfs_sync.c
@@ -359,10 +359,7 @@ xfs_quiesce_data(
359{ 359{
360 int error, error2 = 0; 360 int error, error2 = 0;
361 361
362 xfs_qm_sync(mp, SYNC_TRYLOCK); 362 /* force out the log */
363 xfs_qm_sync(mp, SYNC_WAIT);
364
365 /* force out the newly dirtied log buffers */
366 xfs_log_force(mp, XFS_LOG_SYNC); 363 xfs_log_force(mp, XFS_LOG_SYNC);
367 364
368 /* write superblock and hoover up shutdown errors */ 365 /* write superblock and hoover up shutdown errors */
@@ -470,7 +467,6 @@ xfs_sync_worker(
470 error = xfs_fs_log_dummy(mp); 467 error = xfs_fs_log_dummy(mp);
471 else 468 else
472 xfs_log_force(mp, 0); 469 xfs_log_force(mp, 0);
473 error = xfs_qm_sync(mp, SYNC_TRYLOCK);
474 470
475 /* start pushing all the metadata that is currently dirty */ 471 /* start pushing all the metadata that is currently dirty */
476 xfs_ail_push_all(mp->m_ail); 472 xfs_ail_push_all(mp->m_ail);