diff options
author | pjd <pjd@FreeBSD.org> | 2012-06-10 13:10:21 +0000 |
---|---|---|
committer | pjd <pjd@FreeBSD.org> | 2012-06-10 13:10:21 +0000 |
commit | 0da1a674198b2c75a90d9f2e0eb63bddc23e73d9 (patch) | |
tree | a77137099c23556f060b8ab6e2732af17bc0caa0 /sys/kern/kern_descrip.c | |
parent | a280ada6e7368858fc9816bc37512adaecfd57b1 (diff) | |
download | FreeBSD-src-0da1a674198b2c75a90d9f2e0eb63bddc23e73d9.zip FreeBSD-src-0da1a674198b2c75a90d9f2e0eb63bddc23e73d9.tar.gz |
Merge two ifs into one. Other minor style fixes.
MFC after: 1 month
Diffstat (limited to 'sys/kern/kern_descrip.c')
-rw-r--r-- | sys/kern/kern_descrip.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 2dc743b..0739ccd 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -884,8 +884,7 @@ do_dup(struct thread *td, int flags, int old, int new, fdrop(fp, td); return (EBADF); } - KASSERT(old != new, - ("new fd is same as old")); + KASSERT(old != new, ("new fd is same as old")); /* * Save info on the descriptor being overwritten. We cannot close @@ -896,19 +895,17 @@ do_dup(struct thread *td, int flags, int old, int new, */ delfp = fdp->fd_ofiles[new]; holdleaders = 0; - if (delfp != NULL) { - if (td->td_proc->p_fdtol != NULL) { - /* - * Ask fdfree() to sleep to ensure that all relevant - * process leaders can be traversed in closef(). - */ - fdp->fd_holdleaderscount++; - holdleaders = 1; - } + if (delfp != NULL && td->td_proc->p_fdtol != NULL) { + /* + * Ask fdfree() to sleep to ensure that all relevant + * process leaders can be traversed in closef(). + */ + fdp->fd_holdleaderscount++; + holdleaders = 1; } /* - * Duplicate the source descriptor + * Duplicate the source descriptor. */ fdp->fd_ofiles[new] = fp; fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE; |