summaryrefslogtreecommitdiffstats
path: root/xlators/features/locks
diff options
context:
space:
mode:
authorPranith Kumar K <pranithk@gluster.com>2012-05-18 11:06:52 +0530
committerAnand Avati <avati@redhat.com>2012-05-18 19:03:59 -0700
commit8c112a419db6b7f5605d08d3aab964e4835eb8d9 (patch)
treec51ba052ce3833403b0472658596283965fc2ccd /xlators/features/locks
parent63a9bbb2a846af752e5f7f80b110fc40dc916c4d (diff)
features/locks: insert_and_merge should not operate on blocked locks
Change-Id: I9417fe28d6c2907b8160cd70c2d2c755731bbe67 BUG: 810502 Signed-off-by: Pranith Kumar K <pranithk@gluster.com> Reviewed-on: http://review.gluster.com/3365 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/common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c
index d926a9c..af03cdf 100644
--- a/xlators/features/locks/src/common.c
+++ b/xlators/features/locks/src/common.c
@@ -783,6 +783,8 @@ __insert_and_merge (pl_inode_t *pl_inode, posix_lock_t *lock)
struct _values v = { .locks = {0, 0, 0} };
list_for_each_entry_safe (conf, t, &pl_inode->ext_list, list) {
+ if (conf->blocked)
+ continue;
if (!locks_overlap (conf, lock))
continue;