summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2013-01-16 05:32:49 +0000
committerkib <kib@FreeBSD.org>2013-01-16 05:32:49 +0000
commit82d5c5773ab4bb2c7767d6d6b9ab8f23e488c81d (patch)
tree387390cb717f13d5fad5c0774fc5400946ebbc3c
parentb3d8782481d12417a40b90e1b8260fa56174f33c (diff)
downloadFreeBSD-src-82d5c5773ab4bb2c7767d6d6b9ab8f23e488c81d.zip
FreeBSD-src-82d5c5773ab4bb2c7767d6d6b9ab8f23e488c81d.tar.gz
Remove the filtering of the acceptable mount options for nullfs, added
in r245004. Although the report was for noatime option which is non-functional for the nullfs, other standard options like nosuid or noexec are useful with it. Reported by: Dewayne Geraghty <dewayne.geraghty@heuristicsystems.com.au> MFC after: 3 days
-rw-r--r--sys/fs/nullfs/null_vfsops.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 5abfa49..3724e0a 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -67,15 +67,6 @@ static vfs_vget_t nullfs_vget;
static vfs_extattrctl_t nullfs_extattrctl;
static vfs_reclaim_lowervp_t nullfs_reclaim_lowervp;
-/* Mount options that we support. */
-static const char *nullfs_opts[] = {
- "cache",
- "export",
- "from",
- "target",
- NULL
-};
-
/*
* Mount null layer
*/
@@ -97,8 +88,6 @@ nullfs_mount(struct mount *mp)
return (EPERM);
if (mp->mnt_flag & MNT_ROOTFS)
return (EOPNOTSUPP);
- if (vfs_filteropt(mp->mnt_optnew, nullfs_opts))
- return (EINVAL);
/*
* Update is a no-op
OpenPOWER on IntegriCloud