Author: trasz
Date: Sun Feb 6 23:34:09 2011
New Revision: 218386
URL: http://svn.freebsd.org/changeset/base/218386
Log:
Make it impossible to clear the MNT_NFS4ACLS flag on ZFS filesystem
by using "mount -uw".
Reviewed by: pjd
MFC after: 2 weeks
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Sun Feb
6 23:26:14 2011 (r218385)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Sun Feb
6 23:34:09 2011 (r218386)
@@ -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.
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
