summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log.c
diff options
context:
space:
mode:
authorBen Myers <bpm@sgi.com>2012-05-25 15:45:36 -0500
committerBen Myers <bpm@sgi.com>2012-06-21 13:41:04 -0500
commit11159a0500c1eb7a8a2de37b7dceb53373c75350 (patch)
treeae81aca1b23fbf1b369e84d426ed393956db0fae /fs/xfs/xfs_log.c
parentbcf62ab64d1ba257dd9d4283a077a7219a05073a (diff)
downloadlinux-11159a0500c1eb7a8a2de37b7dceb53373c75350.tar.gz
linux-11159a0500c1eb7a8a2de37b7dceb53373c75350.tar.bz2
linux-11159a0500c1eb7a8a2de37b7dceb53373c75350.zip
xfs: shutdown xfs_sync_worker before the log
Revert commit 1307bbd, which uses the s_umount semaphore to provide exclusion between xfs_sync_worker and unmount, in favor of shutting down the sync worker before freeing the log in xfs_log_unmount. This is a cleaner way of resolving the race between xfs_sync_worker and unmount than using s_umount. Signed-off-by: Ben Myers <bpm@sgi.com> Reviewed-by: Mark Tinguely <tinguely@sgi.com> Reviewed-by: Dave Chinner <dchinner@redhat.com>
Diffstat (limited to 'fs/xfs/xfs_log.c')
-rw-r--r--fs/xfs/xfs_log.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index f30d9807dc48..0e1a64f0439c 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -810,6 +810,7 @@ xfs_log_unmount_write(xfs_mount_t *mp)
void
xfs_log_unmount(xfs_mount_t *mp)
{
+ cancel_delayed_work_sync(&mp->m_sync_work);
xfs_trans_ail_destroy(mp);
xlog_dealloc_log(mp->m_log);
}