diff options
| author | Corentin Chary <corentin.chary@gmail.com> | 2009-10-09 06:25:11 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2009-10-09 05:06:34 -0700 |
| commit | 2231e5f8ab2be2721ebb6662bd1e252cd89cea7a (patch) | |
| tree | f02b707c8d3fdca78f843dfbe7241dc14b86edbf /xlators | |
| parent | 58bc556b84792562ff6cdc60e0e7a48006eb56a9 (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')
| -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 0c57b3b415b..1ce67437576 100644 --- a/xlators/features/locks/src/common.c +++ b/xlators/features/locks/src/common.c @@ -426,10 +426,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]); } |