From owner-svn-src-all@FreeBSD.ORG  Tue Jan 18 14:34:45 2011
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 5940E106566B;
	Tue, 18 Jan 2011 14:34:45 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 487198FC14;
	Tue, 18 Jan 2011 14:34:45 +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 p0IEYjSE040864;
	Tue, 18 Jan 2011 14:34:45 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0IEYjcU040862;
	Tue, 18 Jan 2011 14:34:45 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201101181434.p0IEYjcU040862@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Tue, 18 Jan 2011 14:34: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: r217535 - head/sys/fs/nfs
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, 18 Jan 2011 14:34:45 -0000

Author: rmacklem
Date: Tue Jan 18 14:34:45 2011
New Revision: 217535
URL: http://svn.freebsd.org/changeset/base/217535

Log:
  Fix the experimental NFSv4 server so that it uses VOP_ACCESSX()
  to check for VREAD_ACL instead of VOP_ACCESS().
  
  MFC after:	3 days

Modified:
  head/sys/fs/nfs/nfs_commonsubs.c

Modified: head/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonsubs.c	Tue Jan 18 11:51:51 2011	(r217534)
+++ head/sys/fs/nfs/nfs_commonsubs.c	Tue Jan 18 14:34:45 2011	(r217535)
@@ -1983,7 +1983,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd
 			NFSCLRBIT_ATTRBIT(retbitp, NFSATTRBIT_ACL);
 		} else if (naclp != NULL) {
 			if (vn_lock(vp, LK_SHARED) == 0) {
-				error = VOP_ACCESS(vp, VREAD_ACL, cred, p);
+				error = VOP_ACCESSX(vp, VREAD_ACL, cred, p);
 				if (error == 0)
 					error = VOP_GETACL(vp, ACL_TYPE_NFS4,
 					    naclp, cred, p);