system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-18 14:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Use NAMEI to pickup Giant if we need it in fpcheckstd().

Browse source
This commit is contained in:
Jeff Roberson 2005-05-03 10:52:22 +00:00
parent e11a45c9e5
commit 6de925e58b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=145820
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/kern/kern_descrip.c
View file

@ -1784,8 +1784,6 @@ fdcheckstd(struct thread *td)
register_t retval;
int fd, i, error, flags, devnull;
GIANT_REQUIRED; /* VFS */
fdp = td->td_proc->p_fd;
if (fdp == NULL)
return (0);
@ -1796,13 +1794,14 @@ fdcheckstd(struct thread *td)
if (fdp->fd_ofiles[i] != NULL)
continue;
if (devnull < 0) {
int vfslocked;
error = falloc(td, &fp, &fd);
if (error != 0)
break;
/* Note extra ref on `fp' held for us by falloc(). */
KASSERT(fd == i, ("oof, we didn't get our fd"));
NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, "/dev/null",
td);
NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE,
"/dev/null", td);
flags = FREAD | FWRITE;
error = vn_open(&nd, &flags, 0, -1);
if (error != 0) {
@ -1821,6 +1820,7 @@ fdcheckstd(struct thread *td)
fdrop(fp, td);
break;
}
vfslocked = NDHASGIANT(&nd);
NDFREE(&nd, NDF_ONLY_PNBUF);
fp->f_flag = flags;
fp->f_vnode = nd.ni_vp;
@ -1830,6 +1830,7 @@ fdcheckstd(struct thread *td)
fp->f_ops = &vnops;
fp->f_type = DTYPE_VNODE;
VOP_UNLOCK(nd.ni_vp, 0, td);
VFS_UNLOCK_GIANT(vfslocked);
devnull = fd;
fdrop(fp, td);
} else {