From: Bart Van Assche Date: Wed, 16 Oct 2013 12:20:25 +0000 (+0200) Subject: dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY X-Git-Tag: v3.13-rc1~108^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a97f4a66d8ee4faf0f31cc4ad3f4aa0baef23fc7;p=thirdparty%2Fkernel%2Flinux.git 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: Bart Van Assche Signed-off-by: David Teigland --- diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index 88556dc0458ee..d5abafd56a6d6 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c @@ -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)