From owner-svn-src-stable-7@FreeBSD.ORG  Fri Dec 18 19:50:21 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B862C106566B;
	Fri, 18 Dec 2009 19:50:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A6EC78FC08;
	Fri, 18 Dec 2009 19:50:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBIJoLcj006502;
	Fri, 18 Dec 2009 19:50:21 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBIJoLoJ006500;
	Fri, 18 Dec 2009 19:50:21 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200912181950.nBIJoLoJ006500@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 18 Dec 2009 19:50:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200681 - stable/7/sys/nfsserver
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Dec 2009 19:50:21 -0000

Author: jhb
Date: Fri Dec 18 19:50:21 2009
New Revision: 200681
URL: http://svn.freebsd.org/changeset/base/200681

Log:
  MFC 200084:
  Properly return an error reply if an NFS remove or link operation fails.
  Previously the failing operation would allocate an mbuf and construct an
  error reply, but because the function did not return 0, the NFS server
  assumed it had failed to generate a reply and would leak the reply mbuf as
  well as not sending the reply to the NFS client.

Modified:
  stable/7/sys/nfsserver/nfs_serv.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/nfsserver/nfs_serv.c
==============================================================================
--- stable/7/sys/nfsserver/nfs_serv.c	Fri Dec 18 19:43:44 2009	(r200680)
+++ stable/7/sys/nfsserver/nfs_serv.c	Fri Dec 18 19:50:21 2009	(r200681)
@@ -2219,10 +2219,9 @@ out:
 	}
 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) {
@@ -2596,8 +2595,8 @@ ereply:
 	if (v3) {
 		nfsm_srvpostop_attr(getret, &at);
 		nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-		error = 0;
 	}
+	error = 0;
 	/* fall through */
 
 nfsmout: