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

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

ocfs2/dlm: dlm_thread should not sleep while holding the dlm_spinlock 



This patch addresses the bug in which the dlm_thread could go to sleep
while holding the dlm_spinlock.

Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 535f7026

fs/ocfs2/dlm/dlmthread.c

+4 −2
Original line number Diff line number Diff line
@@ -176,12 +176,14 @@ static int dlm_purge_lockres(struct dlm_ctxt *dlm, 
	     res->lockname.name, master);



	if (!master) {

		/* drop spinlock...  retake below */

		spin_unlock(&dlm->spinlock);



		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);

		spin_unlock(&res->spinlock);

		/* drop spinlock to do messaging, retake below */

		spin_unlock(&dlm->spinlock);



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

		ret = dlm_drop_lockres_ref(dlm, res);

		if (ret < 0) {