diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2004-08-07 14:09:02 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2004-08-07 14:09:02 +0000 |
| commit | b223d06425118a57938ebc5c071f10a38c76f1c5 (patch) | |
| tree | 8b80514dfe09f971a0a5d849acfabc77f0b7d995 /sys/kern/kern_descrip.c | |
| parent | ba0b5c1c3b0eec246be664ba0e782fa25133d6fd (diff) | |
| download | src-b223d06425118a57938ebc5c071f10a38c76f1c5.tar.gz src-b223d06425118a57938ebc5c071f10a38c76f1c5.zip | |
We're not yet ready to assert !Giant in kern_fcntl(), as it's called
with Giant from ABI wrappers such as Linux emulation.
Foot shoot off: phk
Notes
Notes:
svn path=/head/; revision=133267
Diffstat (limited to 'sys/kern/kern_descrip.c')
| -rw-r--r-- | sys/kern/kern_descrip.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 097954546a49..ea0dee1c522f 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -367,7 +367,7 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) switch (cmd) { case F_DUPFD: - mtx_assert(&Giant, MA_NOTOWNED); + /* mtx_assert(&Giant, MA_NOTOWNED); */ FILEDESC_UNLOCK(fdp); newmin = arg; PROC_LOCK(p); @@ -382,21 +382,20 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) break; case F_GETFD: - mtx_assert(&Giant, MA_NOTOWNED); + /* mtx_assert(&Giant, MA_NOTOWNED); */ td->td_retval[0] = (*pop & UF_EXCLOSE) ? FD_CLOEXEC : 0; FILEDESC_UNLOCK(fdp); break; case F_SETFD: - mtx_assert(&Giant, MA_NOTOWNED); + /* mtx_assert(&Giant, MA_NOTOWNED); */ *pop = (*pop &~ UF_EXCLOSE) | (arg & FD_CLOEXEC ? UF_EXCLOSE : 0); FILEDESC_UNLOCK(fdp); break; case F_GETFL: - /* MPSAFE */ - mtx_assert(&Giant, MA_NOTOWNED); + /* mtx_assert(&Giant, MA_NOTOWNED); */ FILE_LOCK(fp); FILEDESC_UNLOCK(fdp); td->td_retval[0] = OFLAGS(fp->f_flag); |