diff options
author | Krutika Dhananjay <kdhananj@redhat.com> | 2014-04-19 20:03:38 +0530 |
---|---|---|
committer | Anand Avati <avati@redhat.com> | 2014-04-25 00:34:29 -0700 |
commit | 500a656c91558dd7913f572369f20b8550e9e98d (patch) | |
tree | 4e4d67a25bc6e653ee99b2ce495bc7c49688733f /xlators/features/locks/src/entrylk.c | |
parent | bc434b3ca961757ade8c6093f4ff0dbe4b3a4672 (diff) |
features/locks: Remove stale inodelk objects from 'blocked_locks' list
* In the event of a DISCONNECT from a client, as part of cleanup,
inodelk objects are not removed from the blocked_locks list before
being unref'd and freed, causing the brick process to crash at
some point when the (now) stale object is accessed again in the list.
* Also during cleanup, it is pointless to try and grant lock to a
previously blocked inodelk (say L1) as part of releasing another
conflicting lock (L2), (which is a side-effect of L1 not being
deleted from blocked_locks list before grant_blocked_inode_locks()
in cleanup) if L1 is also associated with the DISCONNECTing client.
This patch fixes the problem.
* Also, the codepath in cleanup of entrylks seems to be granting
blocked inodelks, when it should be attempting to grant blocked
entrylks, which is fixed in this patch.
Change-Id: I8493365c33020333b3f61aa15f505e4e7e6a9891
BUG: 1089470
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/7512
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/features/locks/src/entrylk.c')
-rw-r--r-- | xlators/features/locks/src/entrylk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c index dc86512bef0..4f5d8aca2c6 100644 --- a/xlators/features/locks/src/entrylk.c +++ b/xlators/features/locks/src/entrylk.c @@ -749,7 +749,7 @@ pl_entrylk_client_cleanup (xlator_t *this, pl_ctx_t *ctx) dom = get_domain (pinode, l->volume); - grant_blocked_inode_locks (this, pinode, dom); + grant_blocked_entry_locks (this, pinode, dom); pthread_mutex_lock (&pinode->mutex); { |