diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-11-01 15:13:16 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-11-01 15:13:16 +0100 |
| commit | ce07e92f0592ebd0af0ad8c5828dd8f0a7b67da4 (patch) | |
| tree | 86627cad66767bf84e40c4fb69063b8a17e88f63 /libfshelp | |
| parent | 7ea3a628613c333ad290797bcb7f4df0a7e11fa2 (diff) | |
| download | hurd-ce07e92f0592ebd0af0ad8c5828dd8f0a7b67da4.tar.gz hurd-ce07e92f0592ebd0af0ad8c5828dd8f0a7b67da4.tar.bz2 hurd-ce07e92f0592ebd0af0ad8c5828dd8f0a7b67da4.zip | |
libfshelp: Fix record lock when len=0
When len=0 and start is completely before an existing lock, there is no
interference.
* libfshelp/rlock-tweak.c (fshelp_rlock_tweak): Fix test when len=0.
Diffstat (limited to 'libfshelp')
| -rw-r--r-- | libfshelp/rlock-tweak.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libfshelp/rlock-tweak.c b/libfshelp/rlock-tweak.c index 8edc53b9..b0f4b9f5 100644 --- a/libfshelp/rlock-tweak.c +++ b/libfshelp/rlock-tweak.c @@ -312,10 +312,8 @@ fshelp_rlock_tweak (struct rlock_box *box, pthread_mutex_t *mutex, return 0; } } - else if (l->start < start - && (len == 0 - || (start <= l->start + l->len - && start + len > l->start + l->len))) + else if (l->start < start && start <= l->start + l->len + && (len == 0 || start + len > l->start + l->len)) /* Our start falls within the locked region or exactly one byte after it and our end falls beyond it. We know that we cannot consume the entire region. */ |