diff options
| author | kib <kib@FreeBSD.org> | 2007-05-31 11:51:53 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2007-05-31 11:51:53 +0000 |
| commit | f13486a2227b9165fce30aa40d12b728f327a909 (patch) | |
| tree | d5e88e86417c996e0e901ce9a43de8d9ae3ad44e /sys/kern/vfs_syscalls.c | |
| parent | 7f276f0bff169823b786ea0a9bbdfe936361fcb4 (diff) | |
| download | FreeBSD-src-f13486a2227b9165fce30aa40d12b728f327a909.zip FreeBSD-src-f13486a2227b9165fce30aa40d12b728f327a909.tar.gz | |
Revert UF_OPENING workaround for CURRENT.
Change the VOP_OPEN(), vn_open() vnode operation and d_fdopen() cdev operation
argument from being file descriptor index into the pointer to struct file.
Proposed and reviewed by: jhb
Reviewed by: daichi (unionfs)
Approved by: re (kensmith)
Diffstat (limited to 'sys/kern/vfs_syscalls.c')
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index fe9d99e..ab10bfa 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -984,19 +984,7 @@ kern_open(struct thread *td, char *path, enum uio_seg pathseg, int flags, cmode = ((mode &~ fdp->fd_cmask) & ALLPERMS) &~ S_ISTXT; NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td); td->td_dupfd = -1; /* XXX check for fdopen */ - FILEDESC_XLOCK(fdp); - if (fp != fdp->fd_ofiles[indx]) { - FILEDESC_XUNLOCK(fdp); - fdrop(fp, td); - td->td_retval[0] = indx; - return (0); - } - fdp->fd_ofileflags[indx] |= UF_OPENING; - FILEDESC_XUNLOCK(fdp); - error = vn_open(&nd, &flags, cmode, indx); - FILEDESC_XLOCK(fdp); - fdp->fd_ofileflags[indx] &= ~UF_OPENING; - FILEDESC_XUNLOCK(fdp); + error = vn_open(&nd, &flags, cmode, fp); if (error) { /* * If the vn_open replaced the method vector, something @@ -4103,7 +4091,7 @@ fhopen(td, uap) if (error) goto bad; } - error = VOP_OPEN(vp, fmode, td->td_ucred, td, -1); + error = VOP_OPEN(vp, fmode, td->td_ucred, td, NULL); if (error) goto bad; |
