 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_descrip.c,v 1.216 2011/07/15 14:50:19 christos Exp $	*/
+/*	$NetBSD: kern_descrip.c,v 1.217 2011/09/25 13:40:37 chs Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,27 +60,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_descrip.c	8.8 (Berkeley) 2/14/95
  */
 /*
  * File descriptor management.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.216 2011/07/15 14:50:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.217 2011/09/25 13:40:37 chs Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/pool.h>
 @@ -281,27 +281,27 @@ static inline void
 fd_used(filedesc_t *fdp, unsigned fd)
+{
 	u_int off = fd >> NDENTRYSHIFT;
 	fdfile_t *ff;
 	ff = fdp->fd_dt->dt_ff[fd];
 	KASSERT(mutex_owned(&fdp->fd_lock));
 	KASSERT((fdp->fd_lomap[off] & (1 << (fd & NDENTRYMASK))) == 0);
 	KASSERT(ff != NULL);
 	KASSERT(ff->ff_file == NULL);
 	KASSERT(!ff->ff_allocated);
-	ff->ff_allocated = 1;
+	ff->ff_allocated = true;
 	fdp->fd_lomap[off] |= 1 << (fd & NDENTRYMASK);
 	if (__predict_false(fdp->fd_lomap[off] == ~0)) {
 		KASSERT((fdp->fd_himap[off >> NDENTRYSHIFT] &
 		    (1 << (off & NDENTRYMASK))) == 0);
 		fdp->fd_himap[off >> NDENTRYSHIFT] |= 1 << (off & NDENTRYMASK);
+	}
 	if ((int)fd > fdp->fd_lastfile) {
 		fdp->fd_lastfile = fd;
+	}
 	fd_checkmaps(fdp);
+}
 @@ -327,27 +327,27 @@ fd_unused(filedesc_t *fdp, unsigned fd)
 	if (fd < fdp->fd_freefile) {
 		fdp->fd_freefile = fd;
+	}
 	if (fdp->fd_lomap[off] == ~0) {
 		KASSERT((fdp->fd_himap[off >> NDENTRYSHIFT] &
 		    (1 << (off & NDENTRYMASK))) != 0);
 		fdp->fd_himap[off >> NDENTRYSHIFT] &=
 		    ~(1 << (off & NDENTRYMASK));
+	}
 	KASSERT((fdp->fd_lomap[off] & (1 << (fd & NDENTRYMASK))) != 0);
 	fdp->fd_lomap[off] &= ~(1 << (fd & NDENTRYMASK));
-	ff->ff_allocated = 0;
+	ff->ff_allocated = false;
 	KASSERT(fd <= fdp->fd_lastfile);
 	if (fd == fdp->fd_lastfile) {
 		fdp->fd_lastfile = fd_last_set(fdp, fd);
+	}
 	fd_checkmaps(fdp);
+}
 /*
  * Look up the file structure corresponding to a file descriptor
  * and return the file, holding a reference on the descriptor.
  */
 file_t *
 @@ -1073,26 +1073,27 @@ fd_allocfile(file_t **resultfp, int *res
 	kauth_cred_t cred;
 	file_t *fp;
 	int error;
 	while ((error = fd_alloc(p, 0, resultfd)) != 0) {
 		if (error != ENOSPC) {
 			return error;
+		}
 		fd_tryexpand(p);
+	}
 	fp = pool_cache_get(file_cache, PR_WAITOK);
 	if (fp == NULL) {
 		fd_abort(p, NULL, *resultfd);
 		return ENFILE;
+	}
 	KASSERT(fp->f_count == 0);
 	KASSERT(fp->f_msgcount == 0);
 	KASSERT(fp->f_unpcount == 0);
 	/* Replace cached credentials if not what we need. */
 	cred = curlwp->l_cred;
 	if (__predict_false(cred != fp->f_cred)) {
 		kauth_cred_free(fp->f_cred);
 		kauth_cred_hold(cred);
 		fp->f_cred = cred;
+	}