diff options
| author | Krutika Dhananjay <kdhananj@redhat.com> | 2014-04-24 16:37:05 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2014-04-26 00:52:25 -0700 |
| commit | 6a188c6b2c95d16c1bb6391c9fcb8ef808c2141b (patch) | |
| tree | 4af0e88cae2d1a7807b647c59e930bc4678aa9ed /xlators/features/locks/src/inodelk.c | |
| parent | 0af287791f0d50b5d2975cb2e2c902c797b05860 (diff) | |
features/locks: Remove stale entrylk objects from 'blocked_locks' list
* In the event of a DISCONNECT from a client, as part of cleanup,
entrylk 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 entrylk (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_entry_locks()
in cleanup) if L1 is also associated with the DISCONNECTing client.
This patch fixes the problem.
Change-Id: I3d684c6bafc7e6db89ba68f0a2ed1dcb333791c6
BUG: 1089470
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/7560
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/features/locks/src/inodelk.c')
| -rw-r--r-- | xlators/features/locks/src/inodelk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c index d105e14f23d..c76cb7f9199 100644 --- a/xlators/features/locks/src/inodelk.c +++ b/xlators/features/locks/src/inodelk.c @@ -26,7 +26,7 @@ inline void __delete_inode_lock (pl_inode_lock_t *lock) { - list_del (&lock->list); + list_del_init (&lock->list); } static inline void |