diff options
| author | trasz <trasz@FreeBSD.org> | 2011-02-06 23:34:09 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2011-02-06 23:34:09 +0000 |
| commit | d1e6a3c9a9cc1e838724ae11732f8b7892b466cd (patch) | |
| tree | c3ff20afa0822cff4702643470b734a2f01dc345 | |
| parent | a86d22f277155f02a0c426e715944cff95cbbf9a (diff) | |
| download | FreeBSD-src-d1e6a3c9a9cc1e838724ae11732f8b7892b466cd.zip FreeBSD-src-d1e6a3c9a9cc1e838724ae11732f8b7892b466cd.tar.gz | |
Make it impossible to clear the MNT_NFS4ACLS flag on ZFS filesystem
by using "mount -uw".
Reviewed by: pjd
MFC after: 2 weeks
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c | 4 |
1 files changed, 3 insertions, 1 deletions
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. |
