Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dc102b7 authored by Sunil Mushran's avatar Sunil Mushran Committed by Mark Fasheh
Browse files

ocfs2/dlm: Retract fix for race between purge and migrate 



Mainline commit d4f7e650 attempts to delay
the dlm_thread from sending the drop ref message if the lockres is being
migrated. The problem is that we make the dlm_thread wait for the migration
to complete. This causes a deadlock as dlm_thread also participates in the
lockres migration process.

A better fix for the original oss bugzilla#1012 is in testing.

Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Acked-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 47be12e4

fs/ocfs2/dlm/dlmthread.c

+1 −2
Original line number Diff line number Diff line
@@ -181,8 +181,7 @@ static int dlm_purge_lockres(struct dlm_ctxt *dlm, 


		spin_lock(&res->spinlock);

		/* This ensures that clear refmap is sent after the set */

		__dlm_wait_on_lockres_flags(res, (DLM_LOCK_RES_SETREF_INPROG |

						  DLM_LOCK_RES_MIGRATING));

		__dlm_wait_on_lockres_flags(res, DLM_LOCK_RES_SETREF_INPROG);

		spin_unlock(&res->spinlock);



		/* clear our bit from the master's refmap, ignore errors */