diff options
| author | Ben Myers <bpm@sgi.com> | 2012-05-25 15:45:36 -0500 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2012-06-21 14:20:48 -0500 |
| commit | 8866fc6fa55e31b2bce931b7963ff16641b39dc7 (patch) | |
| tree | f86eb7377bc637f1cc4f007826ecda945525af48 /fs/xfs/xfs_log.c | |
| parent | 59c84ed0ddc11f1823b4a33ace4fbcc948261bb2 (diff) | |
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.c | 1 |
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); } |