From owner-svn-src-stable-8@FreeBSD.ORG Mon May 16 18:12:32 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0AC7106564A; Mon, 16 May 2011 18:12:32 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AF40D8FC19; Mon, 16 May 2011 18:12:32 +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 p4GICWe0093621; Mon, 16 May 2011 18:12:32 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4GICWlx093619; Mon, 16 May 2011 18:12:32 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201105161812.p4GICWlx093619@svn.freebsd.org> From: Xin LI Date: Mon, 16 May 2011 18:12:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r221999 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2011 18:12:32 -0000 Author: delphij Date: Mon May 16 18:12:32 2011 New Revision: 221999 URL: http://svn.freebsd.org/changeset/base/221999 Log: MFC r217588+218386 (trasz): Add MNT_NFS4ACLS to ZFS mount flags and make it impossible to clear the flag by using 'mount -uw'. It's not conditional, since there is no way to disable NFSv4 ACLs in ZFS. This should make it easier for the NFS server to figure out whether the exported filesystem supports ACLs or not. Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Mon May 16 17:21:22 2011 (r221998) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Mon May 16 18:12:32 2011 (r221999) @@ -1203,6 +1203,8 @@ zfs_mount(vfs_t *vfsp) goto out; } + vfsp->vfs_flag |= MNT_NFS4ACLS; + /* * When doing a remount, we simply refresh our temporary properties * according to those options set in the current VFS options.