diff options
| author | Corentin Chary <corentin.chary@gmail.com> | 2009-10-09 06:24:49 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2009-10-09 05:06:38 -0700 |
| commit | f4d6b3ba3d94fb4cd7e9f9f19aaf3b11a10213a7 (patch) | |
| tree | 3b817cac44ae7b9efff7bd22043c87e8a86c3dbe /xlators/features/locks/src | |
| parent | 726ec6f9819bd29bc6e7a75c06a800fa6e6ac10f (diff) | |
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 <corentin.chary@gmail.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
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
Diffstat (limited to 'xlators/features/locks/src')
| -rw-r--r-- | xlators/features/locks/src/common.c | 4 |
1 files changed, 0 insertions, 4 deletions
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); } |