diff options
| author | kib <kib@FreeBSD.org> | 2009-11-20 22:22:53 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2009-11-20 22:22:53 +0000 |
| commit | 66176c69689f18f787b94036e05758d211ccbd02 (patch) | |
| tree | 8edf09b30acd64f867bd5f62d318057d12cbc22c /sys/kern/kern_descrip.c | |
| parent | 483d9d96d0940b7f9eaeaeaaeec623809a34c436 (diff) | |
| download | FreeBSD-src-66176c69689f18f787b94036e05758d211ccbd02.zip FreeBSD-src-66176c69689f18f787b94036e05758d211ccbd02.tar.gz | |
On the return path from F_RDAHEAD and F_READAHEAD fcntls, do not
unlock Giant twice.
While there, bring conditions in the do/while loops closer to style,
that also makes the lines fit into 80 columns.
Reported and tested by: dougb
Diffstat (limited to 'sys/kern/kern_descrip.c')
| -rw-r--r-- | sys/kern/kern_descrip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 434f54a..676de65 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -718,14 +718,15 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) do { new = old = fp->f_flag; new |= FRDAHEAD; - } while (atomic_cmpset_rel_int(&fp->f_flag, old, new) == 0); + } while (!atomic_cmpset_rel_int(&fp->f_flag, old, new)); readahead_vnlock_fail: VFS_UNLOCK_GIANT(vfslocked); + vfslocked = 0; } else { do { new = old = fp->f_flag; new &= ~FRDAHEAD; - } while (atomic_cmpset_rel_int(&fp->f_flag, old, new) == 0); + } while (!atomic_cmpset_rel_int(&fp->f_flag, old, new)); } fdrop(fp, td); break; |
