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

Commit a97f4a66 authored by Bart Van Assche's avatar Bart Van Assche Committed by David Teigland
Browse files

dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY 



When dlm_release_lockspace(ls, 1) is invoked on a busy system
immediately after the last dlm_unlock() AST has finished it can occur
that lkb_idr_is_local() is invoked for the unlocked LKB since removal
from ls_lkbidr only occurs after the AST has returned. If that happens
dlm_release_lockspace(ls, 1) will return -EBUSY instead of releasing
the lockspace. Fix this race condition by changing lkb_idr_is_local()
such that it only returns true for LKB's that have not yet been
unlocked.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 34ec4de4

fs/dlm/lockspace.c

+1 −3
Original line number Diff line number Diff line
@@ -706,9 +706,7 @@ static int lkb_idr_is_local(int id, void *p, void *data) 
{

	struct dlm_lkb *lkb = p;



	if (!lkb->lkb_nodeid)

		return 1;

	return 0;

	return lkb->lkb_nodeid == 0 && lkb->lkb_grmode != DLM_LOCK_IV;

}



static int lkb_idr_is_any(int id, void *p, void *data)