From f742f5e6902af5c984f948c8ef5c38022752a018 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Fri, 18 May 2012 11:06:52 +0530 Subject: features/locks: insert_and_merge should not operate on blocked locks BUG: 810502 Change-Id: I1c560dae638ddb66f47ea64b661979b31708731b Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.com/3397 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/features/locks/src/common.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'xlators') 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; -- cgit