 @@ -1,14 +1,14 @@
-/*	$NetBSD: fdesc_vnops.c,v 1.110 2010/06/24 13:03:12 hannken Exp $	*/
+/*	$NetBSD: fdesc_vnops.c,v 1.111 2010/07/16 10:41:12 hannken Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software donated to Berkeley by
  * Jan-Simon Pendry.
+ *
  * 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.
 @@ -31,27 +31,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)fdesc_vnops.c	8.17 (Berkeley) 5/22/95
+ *
  * #Id: fdesc_vnops.c,v 1.12 1993/04/06 16:17:17 jsp Exp #
  */
 /*
  * /dev/fd Filesystem
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.110 2010/06/24 13:03:12 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.111 2010/07/16 10:41:12 hannken Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>	/* boottime */
 #include <sys/resourcevar.h>
 #include <sys/socketvar.h>
 #include <sys/filedesc.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 @@ -59,29 +59,27 @@ __KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/buf.h>
 #include <sys/dirent.h>
 #include <sys/tty.h>
 #include <sys/kauth.h>
 #include <sys/atomic.h>
 #include <miscfs/fdesc/fdesc.h>
 #include <miscfs/genfs/genfs.h>
 #define cttyvp(p) ((p)->p_lflag & PL_CONTROLT ? (p)->p_session->s_ttyvp : NULL)
-#define FDL_WANT	0x01
+static kmutex_t fdcache_lock;
 #define FDL_LOCKED	0x02
 static int fdcache_lock;
 dev_t devctty;
 #if (FD_STDIN != FD_STDOUT-1) || (FD_STDOUT != FD_STDERR-1)
 FD_STDIN, FD_STDOUT, FD_STDERR must be a sequence n, n+1, n+2
 #endif
 #define	NFDCACHE 4
 #define FD_NHASH(ix) \
 	(&fdhashtbl[(ix) & fdhash])
 LIST_HEAD(fdhashhead, fdescnode) *fdhashtbl;
 u_long fdhash;
 @@ -177,93 +175,95 @@ const struct vnodeopv_desc fdesc_vnodeop
 	{ &fdesc_vnodeop_p, fdesc_vnodeop_entries };
 /*
  * Initialise cache headers
  */
 void
 fdesc_init(void)
+{
 	int cttymajor;
 	/* locate the major number */
 	cttymajor = devsw_name2chr("ctty", NULL, 0);
 	devctty = makedev(cttymajor, 0);
 	mutex_init(&fdcache_lock, MUTEX_DEFAULT, IPL_NONE);
 	fdhashtbl = hashinit(NFDCACHE, HASH_LIST, true, &fdhash);
+}
 /*
  * Free hash table.
  */
 void
 fdesc_done(void)
+{
 	hashdone(fdhashtbl, HASH_LIST, fdhash);
 	mutex_destroy(&fdcache_lock);
+}
 /*
  * Return a locked vnode of the correct type.
  */
 int
 fdesc_allocvp(fdntype ftype, int ix, struct mount *mp, struct vnode **vpp)
+{
 	struct fdhashhead *fc;
 	struct fdescnode *fd;
 	int error = 0;
 	fc = FD_NHASH(ix);
 loop:
-	for (fd = fc->lh_first; fd != 0; fd = fd->fd_hash.le_next) {
+	mutex_enter(&fdcache_lock);
 	LIST_FOREACH(fd, fc, fd_hash) {
 		if (fd->fd_ix == ix && fd->fd_vnode->v_mount == mp) {
-			if (vget(fd->fd_vnode, LK_EXCLUSIVE))
+			mutex_enter(&fd->fd_vnode->v_interlock);
 			mutex_exit(&fdcache_lock);
 			if (vget(fd->fd_vnode, LK_INTERLOCK | LK_EXCLUSIVE))
 				goto loop;
 			*vpp = fd->fd_vnode;
-			return (error);
+			return 0;
+		}
+	}
 	mutex_exit(&fdcache_lock);
 	/*
 	 * otherwise lock the array while we call getnewvnode
 	 * since that can block.
 	 */
 	if (fdcache_lock & FDL_LOCKED) {
 		fdcache_lock |= FDL_WANT;
 		(void) tsleep(&fdcache_lock, PINOD, "fdcache", 0);
 		goto loop;
 	fdcache_lock |= FDL_LOCKED;
 	error = getnewvnode(VT_FDESC, mp, fdesc_vnodeop_p, vpp);
 	if (error)
-		goto out;
+		return error;
 	mutex_enter(&fdcache_lock);
 	LIST_FOREACH(fd, fc, fd_hash) {
 		if (fd->fd_ix == ix && fd->fd_vnode->v_mount == mp) {
 			/*
 			 * Another thread beat us, push back freshly
 			 * allocated vnode and retry.
 			 */
 			mutex_exit(&fdcache_lock);
 			ungetnewvnode(*vpp);
 			goto loop;
+		}
+	}
 	fd = malloc(sizeof(struct fdescnode), M_TEMP, M_WAITOK);
 	(*vpp)->v_data = fd;
 	fd->fd_vnode = *vpp;
 	fd->fd_type = ftype;
 	fd->fd_fd = -1;
 	fd->fd_link = 0;
 	fd->fd_ix = ix;
 	uvm_vnp_setsize(*vpp, 0);
 	VOP_LOCK(*vpp, LK_EXCLUSIVE);
 	LIST_INSERT_HEAD(fc, fd, fd_hash);
 	mutex_exit(&fdcache_lock);
-out:;
+	return 0;
 	fdcache_lock &= ~FDL_LOCKED;
 	if (fdcache_lock & FDL_WANT) {
 		fdcache_lock &= ~FDL_WANT;
 		wakeup(&fdcache_lock);
 	return (error);
+}
 /*
  * vp is the current namei directory
  * ndp is the name to locate in that directory...
  */
 int
 fdesc_lookup(void *v)
+{
 	struct vop_lookup_args /* {
 		struct vnode * a_dvp;
 		struct vnode ** a_vpp;
 		struct componentname * a_cnp;
 @@ -946,29 +946,31 @@ fdesc_inactive(void *v)
 	vp->v_type = VNON;
 	return (0);
+}
 int
 fdesc_reclaim(void *v)
+{
 	struct vop_reclaim_args /* {
 		struct vnode *a_vp;
 	} */ *ap = v;
 	struct vnode *vp = ap->a_vp;
 	struct fdescnode *fd = VTOFDESC(vp);
 	mutex_enter(&fdcache_lock);
 	LIST_REMOVE(fd, fd_hash);
 	free(vp->v_data, M_TEMP);
 	vp->v_data = 0;
 	mutex_exit(&fdcache_lock);
 	return (0);
+}
 /*
  * Return POSIX pathconf information applicable to special devices.
  */
 int
 fdesc_pathconf(void *v)
+{
 	struct vop_pathconf_args /* {
 		struct vnode *a_vp;
 		int a_name;