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

Commit db0f6ce6 authored by Sunil Mushran's avatar Sunil Mushran Committed by Joel Becker
Browse files

ocfs2: Remove overzealous BUG_ON during blocked lock processing 



During blocked lock processing, we should consider the possibility that the
lock is no longer blocking.

Joel Becker <joel.becker@oracle.com> assisted in fixing this issue.

Reported-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 0d74125a

fs/ocfs2/dlmglue.c

+10 −2
Original line number Diff line number Diff line
@@ -3392,9 +3392,17 @@ static int ocfs2_unblock_lock(struct ocfs2_super *osb, 


	spin_lock_irqsave(&lockres->l_lock, flags);



	BUG_ON(!(lockres->l_flags & OCFS2_LOCK_BLOCKED));



recheck:

	/*

	 * Is it still blocking? If not, we have no more work to do.

	 */

	if (!(lockres->l_flags & OCFS2_LOCK_BLOCKED)) {

		BUG_ON(lockres->l_blocking != DLM_LOCK_NL);

		spin_unlock_irqrestore(&lockres->l_lock, flags);

		ret = 0;

		goto leave;

	}



	if (lockres->l_flags & OCFS2_LOCK_BUSY) {

		/* XXX

		 * This is a *big* race.  The OCFS2_LOCK_PENDING flag