 @@ -1,14 +1,14 @@
-/*	$NetBSD: nfs_node.c,v 1.107 2008/11/19 18:36:09 ad Exp $	*/
+/*	$NetBSD: nfs_node.c,v 1.108 2009/01/02 12:57:29 ad Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
+ *
  * 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.
 @@ -25,90 +25,95 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * 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.
+ *
  *	@(#)nfs_node.c	8.6 (Berkeley) 5/22/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.107 2008/11/19 18:36:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.108 2009/01/02 12:57:29 ad Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/lock.h>
 #include <sys/hash.h>
 #include <sys/kauth.h>
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
 #include <nfs/nfsnode.h>
 #include <nfs/nfsmount.h>
 #include <nfs/nfs_var.h>
 struct pool nfs_node_pool;
 struct pool nfs_vattr_pool;
 static struct workqueue *nfs_sillyworkq;
 MALLOC_JUSTDEFINE(M_NFSNODE, "NFS node", "NFS vnode private part");
 extern int prtactive;
-void nfs_gop_size(struct vnode *, off_t, off_t *, int);
+static void nfs_gop_size(struct vnode *, off_t, off_t *, int);
-int nfs_gop_alloc(struct vnode *, off_t, off_t, int, kauth_cred_t);
+static int nfs_gop_alloc(struct vnode *, off_t, off_t, int, kauth_cred_t);
-int nfs_gop_write(struct vnode *, struct vm_page **, int, int);
+static int nfs_gop_write(struct vnode *, struct vm_page **, int, int);
 static void nfs_sillyworker(struct work *, void *);
 static const struct genfs_ops nfs_genfsops = {
 	.gop_size = nfs_gop_size,
 	.gop_alloc = nfs_gop_alloc,
 	.gop_write = nfs_gop_write,
 };
 /*
  * Reinitialize inode hash table.
  */
 void
 nfs_node_init()
+{
 	malloc_type_attach(M_NFSNODE);
 	pool_init(&nfs_node_pool, sizeof(struct nfsnode), 0, 0, 0, "nfsnodepl",
 	    &pool_allocator_nointr, IPL_NONE);
 	pool_init(&nfs_vattr_pool, sizeof(struct vattr), 0, 0, 0, "nfsvapl",
 	    &pool_allocator_nointr, IPL_NONE);
 	if (workqueue_create(&nfs_sillyworkq, "nfssilly", nfs_sillyworker,
 	    NULL, PRI_NONE, IPL_NONE, 0) != 0) {
 	    	panic("nfs_node_init");
+	}
+}
 /*
  * Free resources previously allocated in nfs_node_reinit().
  */
 void
 nfs_node_done()
+{
 	pool_destroy(&nfs_node_pool);
 	pool_destroy(&nfs_vattr_pool);
-	malloc_type_detach(M_NFSNODE);
+	workqueue_destroy(nfs_sillyworkq);
+}
 #define	RBTONFSNODE(node) \
 	(void *)((uintptr_t)(node) - offsetof(struct nfsnode, n_rbnode))
 struct fh_match {
 	nfsfh_t *fhm_fhp;
 	size_t fhm_fhsize;
 	size_t fhm_fhoffset;
 };
 static int
 nfs_compare_nodes(const struct rb_node *parent, const struct rb_node *node)
 @@ -262,46 +267,27 @@ nfs_inactive(v)
 	if (sp != NULL)
 		nfs_vinvalbuf(vp, 0, sp->s_cred, curlwp, 1);
 	*ap->a_recycle = (np->n_flag & NREMOVED) != 0;
 	np->n_flag &=
 	    (NMODIFIED | NFLUSHINPROG | NFLUSHWANT | NEOFVALID | NTRUNCDELAYED);
 	if (vp->v_type == VDIR && np->n_dircache)
 		nfs_invaldircache(vp,
 		    NFS_INVALDIRCACHE_FORCE | NFS_INVALDIRCACHE_KEEPEOF);
 	VOP_UNLOCK(vp, 0);
 	if (sp != NULL) {
-		int error;
+		workqueue_enqueue(nfs_sillyworkq, &sp->s_work, NULL);
 		/*
 		 * Remove the silly file that was rename'd earlier
 		 * Just in case our thread also has the parent node locked,
 		 * we use LK_CANRECURSE.
 		 */
 		error = vn_lock(sp->s_dvp, LK_EXCLUSIVE | LK_CANRECURSE);
 		if (error || sp->s_dvp->v_data == NULL) {
 			/* XXX should recover */
 			printf("%s: vp=%p error=%d\n",
 			    __func__, sp->s_dvp, error);
 		} else {
 			nfs_removeit(sp);
 		kauth_cred_free(sp->s_cred);
 		vput(sp->s_dvp);
 		kmem_free(sp, sizeof(*sp));
+	}
 	return (0);
+}
 /*
  * Reclaim an nfsnode so that it can be used for other purposes.
  */
 int
 nfs_reclaim(v)
 	void *v;
+{
 	struct vop_reclaim_args /* {
 @@ -364,13 +350,40 @@ nfs_gop_alloc(struct vnode *vp, off_t of
 	return 0;
+}
 int
 nfs_gop_write(struct vnode *vp, struct vm_page **pgs, int npages, int flags)
+{
 	int i;
 	for (i = 0; i < npages; i++) {
 		pmap_page_protect(pgs[i], VM_PROT_READ);
+	}
 	return genfs_gop_write(vp, pgs, npages, flags);
+}
 /*
  * Remove a silly file that was rename'd earlier
  */
 static void
 nfs_sillyworker(struct work *work, void *arg)
+{
 	struct sillyrename *sp;
 	int error;
 	sp = (struct sillyrename *)work;
 	error = vn_lock(sp->s_dvp, LK_EXCLUSIVE);
 	if (error || sp->s_dvp->v_data == NULL) {
 		/* XXX should recover */
 		printf("%s: vp=%p error=%d\n", __func__, sp->s_dvp, error);
 		if (error == 0) {
 			vput(sp->s_dvp);
 		} else {
 			vrele(sp->s_dvp);
+		}
 	} else {
 		nfs_removeit(sp);
 		vput(sp->s_dvp);
+	}
 	kauth_cred_free(sp->s_cred);
 	kmem_free(sp, sizeof(*sp));
+}

 @@ -1,14 +1,14 @@
-/*	 $NetBSD: nfsnode.h,v 1.68 2008/10/22 11:36:06 matt Exp $	*/
+/*	 $NetBSD: nfsnode.h,v 1.69 2009/01/02 12:57:29 ad Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
+ *
  * 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,38 +31,40 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)nfsnode.h	8.9 (Berkeley) 5/14/95
  */
 #ifndef _NFS_NFSNODE_H_
 #define _NFS_NFSNODE_H_
 #include <sys/condvar.h>
 #include <sys/mutex.h>
 #include <sys/rb.h>
 #include <sys/workqueue.h>
 #ifndef _NFS_NFS_H_
 #include <nfs/nfs.h>
 #endif
 #include <miscfs/genfs/genfs.h>
 #include <miscfs/genfs/genfs_node.h>
 /*
  * Silly rename structure that hangs off the nfsnode until the name
  * can be removed by nfs_inactive()
  */
 struct sillyrename {
 	struct work	s_work;
 	kauth_cred_t	s_cred;
 	struct	vnode *s_dvp;
 	long	s_namlen;
 	char	s_name[20];
 };
 /*
  * Definitions for the directory cache. Because directory cookies
  * are an opaque 64 bit entity, we need to provide some sort of
  * mapping between cookies and logical blocknumbers. Also,
  * we should store the cookies from the server somewhere,
  * to be able to satisfy VOP_READDIR requests for cookies.
  * We can't store the cookies in the dirent structure, as some
 @@ -271,23 +273,22 @@ int	nfs_readlink	__P((void *));
 #define	nfs_abortop	genfs_abortop
 int	nfs_inactive	__P((void *));
 int	nfs_reclaim	__P((void *));
 #define nfs_lock	genfs_lock
 int	nfs_unlock	__P((void *));
 #define nfs_islocked	genfs_islocked
 int	nfs_bmap	__P((void *));
 int	nfs_strategy	__P((void *));
 int	nfs_print	__P((void *));
 int	nfs_pathconf	__P((void *));
 int	nfs_advlock	__P((void *));
 int	nfs_getpages	__P((void *));
 int	nfs_putpages	__P((void *));
 int	nfs_gop_write(struct vnode *, struct vm_page **, int, int);
 int	nfs_kqfilter	__P((void *));
 extern int (**nfsv2_vnodeop_p) __P((void *));
 #define	NFS_INVALIDATE_ATTRCACHE(np)	(np)->n_attrstamp = 0
 #endif /* _KERNEL */
 #endif