Index: nfs_node.c
===================================================================
RCS file: /home/hiten/ncvs/src/sys/nfsclient/nfs_node.c,v
retrieving revision 1.59
diff -u -r1.59 nfs_node.c
--- nfs_node.c	20 Oct 2002 21:40:55 -0000	1.59
+++ nfs_node.c	21 Dec 2002 20:07:40 -0000
@@ -280,7 +280,7 @@
 {
 	struct nfsnode *np;
 	struct sillyrename *sp;
-	struct thread *td = curthread;	/* XXX */
+	struct thread *td = ap->a_td;
 
 	np = VTONFS(ap->a_vp);
 	if (prtactive && vrefcnt(ap->a_vp) != 0)
@@ -309,7 +309,7 @@
 		/*
 		 * Remove the silly file that was rename'd earlier
 		 */
-		nfs_removeit(sp);
+		nfs_removeit(sp, td);
 		crfree(sp->s_cred);
 		vrele(sp->s_dvp);
 		FREE((caddr_t)sp, M_NFSREQ);
Index: nfs_vnops.c
===================================================================
RCS file: /home/hiten/ncvs/src/sys/nfsclient/nfs_vnops.c,v
retrieving revision 1.189
diff -u -r1.189 nfs_vnops.c
--- nfs_vnops.c	11 Oct 2002 14:58:32 -0000	1.189
+++ nfs_vnops.c	21 Dec 2002 20:04:35 -0000
@@ -221,10 +221,10 @@
 	{ &fifo_nfsv2nodeop_p, nfsv2_fifoop_entries };
 VNODEOP_SET(fifo_nfsv2nodeop_opv_desc);
 
+/*int	nfs_removerpc(struct vnode *dvp, const char *name, int namelen,
+		      struct ucred *cred, struct thread *td);*/
 static int	nfs_mknodrpc(struct vnode *dvp, struct vnode **vpp,
 			     struct componentname *cnp, struct vattr *vap);
-static int	nfs_removerpc(struct vnode *dvp, const char *name, int namelen,
-			      struct ucred *cred, struct thread *td);
 static int	nfs_renamerpc(struct vnode *fdvp, const char *fnameptr,
 			      int fnamelen, struct vnode *tdvp,
 			      const char *tnameptr, int tnamelen,
@@ -1461,20 +1461,9 @@
 }
 
 /*
- * nfs file remove rpc called from nfs_inactive
- */
-int
-nfs_removeit(struct sillyrename *sp)
-{
-
-	return (nfs_removerpc(sp->s_dvp, sp->s_name, sp->s_namlen, sp->s_cred,
-		NULL));
-}
-
-/*
  * Nfs remove rpc, called from nfs_remove() and nfs_removeit().
  */
-static int
+int
 nfs_removerpc(struct vnode *dvp, const char *name, int namelen,
     struct ucred *cred, struct thread *td)
 {
Index: nfsnode.h
===================================================================
RCS file: /home/hiten/ncvs/src/sys/nfsclient/nfsnode.h,v
retrieving revision 1.38
diff -u -r1.38 nfsnode.h
--- nfsnode.h	27 Apr 2002 22:10:16 -0000	1.38
+++ nfsnode.h	21 Dec 2002 20:04:20 -0000
@@ -191,8 +191,17 @@
 int	nfs_inactive(struct vop_inactive_args *);
 int	nfs_reclaim(struct vop_reclaim_args *);
 
+extern int nfs_removerpc(struct vnode *dvp, const char *name, int namelen,
+				struct ucred *cred, struct thread *td);
 /* other stuff */
-int	nfs_removeit(struct sillyrename *);
+/*
+ * nfs file remove rpc called from nfs_inactive
+ */
+static __inline int nfs_removeit(struct sillyrename *sp, struct thread *td)
+{
+	return (nfs_removerpc(sp->s_dvp, sp->s_name, sp->s_namlen, sp->s_cred, td));
+}
+
 int	nfs_nget(struct mount *, nfsfh_t *, int, struct nfsnode **);
 nfsuint64 *nfs_getcookie(struct nfsnode *, off_t, int);
 void	nfs_invaldir(struct vnode *);