aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_super.c
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2012-10-08 06:56:02 -0400
committerBen Myers <bpm@sgi.com>2012-10-17 12:53:29 -0400
commitf661f1e0bf5002bdcc8b5810ad0a184a1841537f (patch)
treefe6a0e5f14e3b2c0c6e01dcddbf6de1b8b3de26e /fs/xfs/xfs_super.c
parent7f7bebefba152c5bdfe961cd2e97e8695a32998c (diff)
xfs: sync work is now only periodic log work
The only thing the periodic sync work does now is flush the AIL and idle the log. These are really functions of the log code, so move the work to xfs_log.c and rename it appropriately. The only wart that this leaves behind is the xfssyncd_centisecs sysctl, otherwise the xfssyncd is dead. Clean up any comments that related to xfssyncd to reflect it's passing. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Mark Tinguely <tinguely@sgi.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_super.c')
-rw-r--r--fs/xfs/xfs_super.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 20fa955d80d1..37c39a155a58 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1005,7 +1005,6 @@ xfs_fs_put_super(
1005{ 1005{
1006 struct xfs_mount *mp = XFS_M(sb); 1006 struct xfs_mount *mp = XFS_M(sb);
1007 1007
1008 cancel_delayed_work_sync(&mp->m_sync_work);
1009 cancel_work_sync(&mp->m_flush_work); 1008 cancel_work_sync(&mp->m_flush_work);
1010 1009
1011 xfs_filestream_unmount(mp); 1010 xfs_filestream_unmount(mp);
@@ -1040,10 +1039,10 @@ xfs_fs_sync_fs(
1040 if (laptop_mode) { 1039 if (laptop_mode) {
1041 /* 1040 /*
1042 * The disk must be active because we're syncing. 1041 * The disk must be active because we're syncing.
1043 * We schedule xfssyncd now (now that the disk is 1042 * We schedule log work now (now that the disk is
1044 * active) instead of later (when it might not be). 1043 * active) instead of later (when it might not be).
1045 */ 1044 */
1046 flush_delayed_work(&mp->m_sync_work); 1045 flush_delayed_work(&mp->m_log->l_work);
1047 } 1046 }
1048 1047
1049 return 0; 1048 return 0;
@@ -1200,7 +1199,7 @@ xfs_fs_remount(
1200 * value if it is non-zero, otherwise go with the default. 1199 * value if it is non-zero, otherwise go with the default.
1201 */ 1200 */
1202 xfs_restore_resvblks(mp); 1201 xfs_restore_resvblks(mp);
1203 xfs_syncd_queue_sync(mp); 1202 xfs_log_work_queue(mp);
1204 } 1203 }
1205 1204
1206 /* rw -> ro */ 1205 /* rw -> ro */
@@ -1246,7 +1245,7 @@ xfs_fs_unfreeze(
1246 struct xfs_mount *mp = XFS_M(sb); 1245 struct xfs_mount *mp = XFS_M(sb);
1247 1246
1248 xfs_restore_resvblks(mp); 1247 xfs_restore_resvblks(mp);
1249 xfs_syncd_queue_sync(mp); 1248 xfs_log_work_queue(mp);
1250 return 0; 1249 return 0;
1251} 1250}
1252 1251
@@ -1326,7 +1325,6 @@ xfs_fs_fill_super(
1326 mutex_init(&mp->m_growlock); 1325 mutex_init(&mp->m_growlock);
1327 atomic_set(&mp->m_active_trans, 0); 1326 atomic_set(&mp->m_active_trans, 0);
1328 INIT_WORK(&mp->m_flush_work, xfs_flush_worker); 1327 INIT_WORK(&mp->m_flush_work, xfs_flush_worker);
1329 INIT_DELAYED_WORK(&mp->m_sync_work, xfs_sync_worker);
1330 INIT_DELAYED_WORK(&mp->m_reclaim_work, xfs_reclaim_worker); 1328 INIT_DELAYED_WORK(&mp->m_reclaim_work, xfs_reclaim_worker);
1331 1329
1332 mp->m_super = sb; 1330 mp->m_super = sb;
@@ -1410,12 +1408,6 @@ xfs_fs_fill_super(
1410 goto out_unmount; 1408 goto out_unmount;
1411 } 1409 }
1412 1410
1413 /*
1414 * The filesystem is successfully mounted, so we can start background
1415 * sync work now.
1416 */
1417 xfs_syncd_queue_sync(mp);
1418
1419 return 0; 1411 return 0;
1420 1412
1421 out_filestream_unmount: 1413 out_filestream_unmount: