From f4d6b3ba3d94fb4cd7e9f9f19aaf3b11a10213a7 Mon Sep 17 00:00:00 2001 From: Corentin Chary Date: Fri, 9 Oct 2009 06:24:49 +0000 Subject: features/locks: Fix insert_and_merge Init the list structure, because it will be used later, and subtract_lock does not do it. Also remove the special handling for unlocks, which was probably introduced as a workaround for this bug. Signed-off-by: Corentin Chary Signed-off-by: Anand V. Avati BUG: 297 (Posix locks cannot handle a single unlock over multiple held locks) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=297 --- xlators/features/locks/src/common.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'xlators/features') diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c index 4d3394ce0..dbda5f23f 100644 --- a/xlators/features/locks/src/common.c +++ b/xlators/features/locks/src/common.c @@ -380,10 +380,6 @@ __insert_and_merge (pl_inode_t *pl_inode, posix_lock_t *lock, if (!v.locks[i]) continue; - if (v.locks[i]->fl_type == F_UNLCK) { - __destroy_lock (v.locks[i]); - continue; - } __insert_and_merge (pl_inode, v.locks[i], dom); } -- cgit