From owner-svn-src-all@FreeBSD.ORG  Fri Dec 19 04:02:17 2008
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 077FE1065670;
	Fri, 19 Dec 2008 04:02:17 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EB47D8FC19;
	Fri, 19 Dec 2008 04:02:16 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJ42GlF060998;
	Fri, 19 Dec 2008 04:02:16 GMT
	(envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBJ42GF4060997;
	Fri, 19 Dec 2008 04:02:16 GMT
	(envelope-from kensmith@svn.freebsd.org)
Message-Id: <200812190402.mBJ42GF4060997@svn.freebsd.org>
From: Ken Smith <kensmith@FreeBSD.org>
Date: Fri, 19 Dec 2008 04:02:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186310 - releng/7.1/sys/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: Fri, 19 Dec 2008 04:02:17 -0000

Author: kensmith
Date: Fri Dec 19 04:02:16 2008
New Revision: 186310
URL: http://svn.freebsd.org/changeset/base/186310

Log:
  MFC r186165:
  > Handle VFS_VGET() failing with an error other than EOPNOTSUPP in addition
  > to failing with that error.
  >
  > PR:           125149
  > Submitted by: Jaakko Heinonen (jh <at> saunalahti <dot> fi)
  > Reviewed by:  mohans, kan
  
  Approved by:    re (kib)

Modified:
  releng/7.1/sys/nfsserver/nfs_serv.c

Modified: releng/7.1/sys/nfsserver/nfs_serv.c
==============================================================================
--- releng/7.1/sys/nfsserver/nfs_serv.c	Fri Dec 19 03:59:20 2008	(r186309)
+++ releng/7.1/sys/nfsserver/nfs_serv.c	Fri Dec 19 04:02:16 2008	(r186310)
@@ -3600,9 +3600,12 @@ again:
 	 * Probe one of the directory entries to see if the filesystem
 	 * supports VGET.
 	 */
-	if (VFS_VGET(vp->v_mount, dp->d_fileno, LK_EXCLUSIVE, &nvp) ==
-	    EOPNOTSUPP) {
-		error = NFSERR_NOTSUPP;
+	error = VFS_VGET(vp->v_mount, dp->d_fileno, LK_EXCLUSIVE, &nvp);
+	if (error) {
+		if (error == EOPNOTSUPP)
+			error = NFSERR_NOTSUPP;
+		else
+			error = NFSERR_SERVERFAULT;
 		vrele(vp);
 		vp = NULL;
 		free((caddr_t)cookies, M_TEMP);