summaryrefslogtreecommitdiffstats
path: root/xlators/features/locks
diff options
context:
space:
mode:
authorPranith Kumar K <pranithk@gluster.com>2012-05-18 17:00:07 +0530
committerAnand Avati <avati@redhat.com>2012-05-18 19:04:31 -0700
commit5b6c82cfc0d07981b618fe5a7bd7f4125de9e6a4 (patch)
tree1a4b9ae2f58bb5ff5b937024cdce5ac98ff11b34 /xlators/features/locks
parent8c112a419db6b7f5605d08d3aab964e4835eb8d9 (diff)
features/locks: Don't delete blocked locks in pl_flush
Change-Id: I442e8d866df317b901f24cf447412179bb61a01c BUG: 810502 Signed-off-by: Pranith Kumar K <pranithk@gluster.com> Reviewed-on: http://review.gluster.com/3366 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/features/locks')
-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 32d37f6..2c0f583 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,