diff options
| author | jhb <jhb@FreeBSD.org> | 2009-07-31 13:40:06 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2009-07-31 13:40:06 +0000 |
| commit | 03d158678f1be45d0a053a2a17d0882d192ad011 (patch) | |
| tree | 3c0ee46bb65f1cead854a069eba0dc7df6fddee0 /sys/fs/unionfs/union_subr.c | |
| parent | ee695c0b4b51fdb522a1706339d3476b2cbe0982 (diff) | |
| download | FreeBSD-src-03d158678f1be45d0a053a2a17d0882d192ad011.zip FreeBSD-src-03d158678f1be45d0a053a2a17d0882d192ad011.tar.gz | |
Fix some LORs between vnode locks and filedescriptor table locks.
- Don't grab the filedesc lock just to read fd_cmask.
- Drop vnode locks earlier when mounting the root filesystem and before
sanitizing stdin/out/err file descriptors during execve().
Submitted by: kib
Approved by: re (rwatson)
MFC after: 1 week
Diffstat (limited to 'sys/fs/unionfs/union_subr.c')
| -rw-r--r-- | sys/fs/unionfs/union_subr.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index bfcbdcd..0791d2e 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -486,9 +486,7 @@ unionfs_create_uppervattr_core(struct unionfs_mount *ump, } break; default: /* UNIONFS_TRADITIONAL */ - FILEDESC_SLOCK(td->td_proc->p_fd); uva->va_mode = 0777 & ~td->td_proc->p_fd->fd_cmask; - FILEDESC_SUNLOCK(td->td_proc->p_fd); uva->va_uid = ump->um_uid; uva->va_gid = ump->um_gid; break; |
