From owner-svn-src-head@FreeBSD.ORG  Sun May 24 23:47:23 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 4DA38106566C;
	Sun, 24 May 2009 23:47:23 +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 2C1D28FC13;
	Sun, 24 May 2009 23:47:23 +0000 (UTC)
	(envelope-from rmacklem@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 n4ONlN0K004505;
	Sun, 24 May 2009 23:47:23 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4ONlNII004504;
	Sun, 24 May 2009 23:47:23 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <200905242347.n4ONlNII004504@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 24 May 2009 23:47:23 +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: r192705 - head/sys/fs/nfs
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: Sun, 24 May 2009 23:47:23 -0000

Author: rmacklem
Date: Sun May 24 23:47:22 2009
New Revision: 192705
URL: http://svn.freebsd.org/changeset/base/192705

Log:
  Temporarily #undef NFS4_ACL_EXTATTR_NAME, so that the
  experimental nfs subsystem will build while the NFSv4 ACL
  support is going into the kernel.
  
  Approved by:	kib (mentor)

Modified:
  head/sys/fs/nfs/nfsport.h

Modified: head/sys/fs/nfs/nfsport.h
==============================================================================
--- head/sys/fs/nfs/nfsport.h	Sun May 24 23:24:49 2009	(r192704)
+++ head/sys/fs/nfs/nfsport.h	Sun May 24 23:47:22 2009	(r192705)
@@ -71,6 +71,8 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/acl.h>
+/* until the nfsv4 acl stuff is all committed, undef NFS4_ACL_EXTATTR_NAME */
+#undef NFS4_ACL_EXTATTR_NAME
 #include <sys/module.h>
 #include <sys/sysent.h>
 #include <sys/syscall.h>