kern/140853: [nfs] [patch] NFSv2 remove calls fail to send error replies (memory leak!)

[John Baldwin]

On Tuesday 24 November 2009 10:40:05 pm linimon at freebsd.org wrote:
> Old Synopsis: NFSv2 remove calls fail to send error replies (memory leak!)
> New Synopsis: [nfs] [patch] NFSv2 remove calls fail to send error replies 
(memory leak!)
> 
> Responsible-Changed-From-To: freebsd-bugs->freebsd-fs
> Responsible-Changed-By: linimon
> Responsible-Changed-When: Wed Nov 25 03:39:42 UTC 2009
> Responsible-Changed-Why: 
> Over to maintainer(s).

I think nfsrv_link() has the same leak as well.  Rick, does this look ok to 
you?

Index: nfs_serv.c
===================================================================
--- nfs_serv.c	(revision 199529)
+++ nfs_serv.c	(working copy)
@@ -1810,10 +1810,9 @@
 	}
 ereply:
 	nfsm_reply(NFSX_WCCDATA(v3));
-	if (v3) {
+	if (v3)
 		nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-		error = 0;
-	}
+	error = 0;
 nfsmout:
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	if (nd.ni_dvp) {
@@ -2187,8 +2186,8 @@
 	if (v3) {
 		nfsm_srvpostop_attr(getret, &at);
 		nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-		error = 0;
 	}
+	error = 0;
 	/* fall through */
 
 nfsmout:

-- 
John Baldwin