diff options
| author | Pranith Kumar K <pranithk@gluster.com> | 2012-05-18 11:06:52 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-05-22 04:30:01 -0700 |
| commit | f742f5e6902af5c984f948c8ef5c38022752a018 (patch) | |
| tree | c03a0b984cefeeb46b80d92e5f0ce72cd1a0f718 /xlators | |
| parent | a289a11b0f7892e62e4b31041c852c4a98fa4c25 (diff) | |
features/locks: insert_and_merge should not operate on blocked locks
BUG: 810502
Change-Id: I1c560dae638ddb66f47ea64b661979b31708731b
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Reviewed-on: http://review.gluster.com/3397
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/common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c index d926a9c6f..af03cdf2a 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; |