From owner-svn-src-all@FreeBSD.ORG  Tue May  8 03:39:45 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BA328106566B;
	Tue,  8 May 2012 03:39:45 +0000 (UTC) (envelope-from jwd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A4B578FC0A;
	Tue,  8 May 2012 03:39:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q483dj7n094494;
	Tue, 8 May 2012 03:39:45 GMT (envelope-from jwd@svn.freebsd.org)
Received: (from jwd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q483djBV094491;
	Tue, 8 May 2012 03:39:45 GMT (envelope-from jwd@svn.freebsd.org)
Message-Id: <201205080339.q483djBV094491@svn.freebsd.org>
From: "John W. De Boskey" <jwd@FreeBSD.org>
Date: Tue, 8 May 2012 03:39:45 +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: r235136 - head/sys/fs/nfsserver
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 May 2012 03:39:45 -0000

Author: jwd
Date: Tue May  8 03:39:44 2012
New Revision: 235136
URL: http://svn.freebsd.org/changeset/base/235136

Log:
  Use the common api helper routine instead of freeing the namei
  buffer directly.
  
  Approved by:	rmacklem (mentor)
  MFC after:	1 month

Modified:
  head/sys/fs/nfsserver/nfs_nfsdport.c

Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c	Mon May  7 19:17:09 2012	(r235135)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c	Tue May  8 03:39:44 2012	(r235136)
@@ -505,11 +505,10 @@ nfsvno_namei(struct nfsrv_descript *nd, 
 
 out:
 	if (error) {
-		uma_zfree(namei_zone, cnp->cn_pnbuf);
+		nfsvno_relpathbuf(ndp);
 		ndp->ni_vp = NULL;
 		ndp->ni_dvp = NULL;
 		ndp->ni_startdir = NULL;
-		cnp->cn_flags &= ~HASBUF;
 	} else if ((ndp->ni_cnd.cn_flags & (WANTPARENT|LOCKPARENT)) == 0) {
 		ndp->ni_dvp = NULL;
 	}