summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorPranith Kumar K <pranithk@gluster.com>2012-05-18 17:00:07 +0530
committerVijay Bellur <vijay@gluster.com>2012-05-22 04:30:19 -0700
commit27960b127ea55f1bd877c1e421c93fea3a2c42af (patch)
tree8c951fbc7771ca5e4b2c77aeb9b967af1e1d3823 /xlators
parentf742f5e6902af5c984f948c8ef5c38022752a018 (diff)
features/locks: Don't delete blocked locks in pl_flush
BUG: 810502 Change-Id: I68c1c11754e1f4413b457c5f4bb7da3bc1aafc23 Signed-off-by: Pranith Kumar K <pranithk@gluster.com> Reviewed-on: http://review.gluster.com/3398 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/features/locks/src/posix.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c
index 32d37f6abea..2c0f583e6f7 100644
--- a/xlators/features/locks/src/posix.c
+++ b/xlators/features/locks/src/posix.c
@@ -360,6 +360,8 @@ __delete_locks_of_owner (pl_inode_t *pl_inode,
/* TODO: what if it is a blocked lock with pending l->frame */
list_for_each_entry_safe (l, tmp, &pl_inode->ext_list, list) {
+ if (l->blocked)
+ continue;
if ((l->transport == transport) &&
is_same_lkowner (&l->owner, owner)) {
gf_log ("posix-locks", GF_LOG_TRACE,