From d1e6a3c9a9cc1e838724ae11732f8b7892b466cd Mon Sep 17 00:00:00 2001 From: trasz Date: Sun, 6 Feb 2011 23:34:09 +0000 Subject: Make it impossible to clear the MNT_NFS4ACLS flag on ZFS filesystem by using "mount -uw". Reviewed by: pjd MFC after: 2 weeks --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c index 70b605d..287de4c 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c @@ -1021,7 +1021,7 @@ zfs_domount(vfs_t *vfsp, char *osname) zfsvfs->z_vfs->mnt_stat.f_iosize = recordsize; vfsp->vfs_data = zfsvfs; - vfsp->mnt_flag |= MNT_LOCAL | MNT_NFS4ACLS; + vfsp->mnt_flag |= MNT_LOCAL; vfsp->mnt_kern_flag |= MNTK_MPSAFE; vfsp->mnt_kern_flag |= MNTK_LOOKUP_SHARED; vfsp->mnt_kern_flag |= MNTK_SHARED_WRITES; @@ -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. -- cgit v1.1