From owner-svn-src-head@FreeBSD.ORG  Thu Dec  3 20:59:28 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 64583106566C;
	Thu,  3 Dec 2009 20:59:28 +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 5380F8FC0A;
	Thu,  3 Dec 2009 20:59:28 +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 nB3KxS9A026038;
	Thu, 3 Dec 2009 20:59:28 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB3KxSUa026036;
	Thu, 3 Dec 2009 20:59:28 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200912032059.nB3KxSUa026036@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 3 Dec 2009 20:59:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200084 - head/sys/nfsserver
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Dec 2009 20:59:28 -0000

Author: jhb
Date: Thu Dec  3 20:59:28 2009
New Revision: 200084
URL: http://svn.freebsd.org/changeset/base/200084

Log:
  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.
  
  PR:		kern/140853
  Submitted by:	Ted Faber  faber at isi edu (remove)
  Reviewed by:	rmacklem (remove)
  MFC after:	1 week

Modified:
  head/sys/nfsserver/nfs_serv.c

Modified: head/sys/nfsserver/nfs_serv.c
==============================================================================
--- head/sys/nfsserver/nfs_serv.c	Thu Dec  3 20:55:09 2009	(r200083)
+++ head/sys/nfsserver/nfs_serv.c	Thu Dec  3 20:59:28 2009	(r200084)
@@ -1810,10 +1810,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) {
@@ -2187,8 +2186,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: