From 82d5c5773ab4bb2c7767d6d6b9ab8f23e488c81d Mon Sep 17 00:00:00 2001 From: kib Date: Wed, 16 Jan 2013 05:32:49 +0000 Subject: [PATCH] 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 MFC after: 3 days --- sys/fs/nullfs/null_vfsops.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 5abfa49cf14f..3724e0a3bb68 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