summaryrefslogtreecommitdiffstats
path: root/fs/dlm
diff options
context:
space:
mode:
authorBart Van Assche <bvanassche@acm.org>2013-10-16 14:20:25 +0200
committerDavid Teigland <teigland@redhat.com>2013-10-16 10:32:42 -0500
commita97f4a66d8ee4faf0f31cc4ad3f4aa0baef23fc7 (patch)
tree8d03d86e9336e219c61a38bb88d2bff4c65ff201 /fs/dlm
parent34ec4de42be5006abdd8d0c08b306ffaa64d0d5d (diff)
downloadlinux-stable-a97f4a66d8ee4faf0f31cc4ad3f4aa0baef23fc7.tar.gz
linux-stable-a97f4a66d8ee4faf0f31cc4ad3f4aa0baef23fc7.tar.bz2
linux-stable-a97f4a66d8ee4faf0f31cc4ad3f4aa0baef23fc7.zip
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 <bvanassche@acm.org> Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm')
-rw-r--r--fs/dlm/lockspace.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 88556dc0458e..d5abafd56a6d 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)