Commit 23e0813a authored by piaojun's avatar piaojun Committed by Linus Torvalds
Browse files

ocfs2: no need flush workqueue before destroying it

destroy_workqueue() will do flushing work for us.

Link: http://lkml.kernel.org/r/59E06476.3090502@huawei.com


Signed-off-by: default avatarJun Piao <piaojun@huawei.com>
Reviewed-by: default avatarJoseph Qi <jiangqi903@gmail.com>
Cc: Mark Fasheh <mfasheh@versity.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a60874f8
...@@ -394,7 +394,6 @@ int dlm_domain_fully_joined(struct dlm_ctxt *dlm) ...@@ -394,7 +394,6 @@ int dlm_domain_fully_joined(struct dlm_ctxt *dlm)
static void dlm_destroy_dlm_worker(struct dlm_ctxt *dlm) static void dlm_destroy_dlm_worker(struct dlm_ctxt *dlm)
{ {
if (dlm->dlm_worker) { if (dlm->dlm_worker) {
flush_workqueue(dlm->dlm_worker);
destroy_workqueue(dlm->dlm_worker); destroy_workqueue(dlm->dlm_worker);
dlm->dlm_worker = NULL; dlm->dlm_worker = NULL;
} }
......
...@@ -670,7 +670,6 @@ static void __exit exit_dlmfs_fs(void) ...@@ -670,7 +670,6 @@ static void __exit exit_dlmfs_fs(void)
{ {
unregister_filesystem(&dlmfs_fs_type); unregister_filesystem(&dlmfs_fs_type);
flush_workqueue(user_dlm_worker);
destroy_workqueue(user_dlm_worker); destroy_workqueue(user_dlm_worker);
/* /*
......
...@@ -2521,10 +2521,8 @@ static void ocfs2_delete_osb(struct ocfs2_super *osb) ...@@ -2521,10 +2521,8 @@ static void ocfs2_delete_osb(struct ocfs2_super *osb)
/* This function assumes that the caller has the main osb resource */ /* This function assumes that the caller has the main osb resource */
/* ocfs2_initializer_super have already created this workqueue */ /* ocfs2_initializer_super have already created this workqueue */
if (osb->ocfs2_wq) { if (osb->ocfs2_wq)
flush_workqueue(osb->ocfs2_wq);
destroy_workqueue(osb->ocfs2_wq); destroy_workqueue(osb->ocfs2_wq);
}
ocfs2_free_slot_info(osb); ocfs2_free_slot_info(osb);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment