Fix a nit with the 'nofoo' options where 'foo' is mapped to 'nonofoo'

(such as 'atime' vs 'noatime').  The filesystems will always see either
'nofoo' or 'nonofoo', never plain 'foo'.  As such, their list of valid
mount options should include 'nofoo' instead of 'foo'.  With this fix,
you can do 'mount -u -o atime' on a FFS filesystem that isn't marked as
noatime without getting an error.  You can also update a noatime FFS
filesystem mounted via mount(2) (e.g. 6.x /sbin/mount binary) to 'atime'
using nmount(2) (e.g. 7.x /sbin/mount binary).

MFC after:	1 week
Reviewed by:	crodig
This commit is contained in:
John Baldwin 2008-03-26 20:48:07 +00:00
parent 8c0b6469bf
commit d952ba1bd5
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=177645
2 changed files with 4 additions and 4 deletions

View File

@ -117,7 +117,7 @@ static int ext2_check_sb_compat(struct ext2_super_block *es, struct cdev *dev,
static int compute_sb_data(struct vnode * devvp,
struct ext2_super_block * es, struct ext2_sb_info * fs);
static const char *ext2_opts[] = { "from", "export", "acls", "exec",
static const char *ext2_opts[] = { "from", "export", "acls", "noexec",
"noatime", "union", "suiddir", "multilabel", "nosymfollow",
"noclusterr", "noclusterw", "force", NULL };

View File

@ -122,9 +122,9 @@ static struct buf_ops ffs_ops = {
#endif
};
static const char *ffs_opts[] = { "acls", "async", "atime", "clusterr",
"clusterw", "exec", "export", "force", "from", "multilabel",
"snapshot", "suid", "suiddir", "symfollow", "sync",
static const char *ffs_opts[] = { "acls", "async", "noatime", "noclusterr",
"noclusterw", "noexec", "export", "force", "from", "multilabel",
"snapshot", "nosuid", "suiddir", "nosymfollow", "sync",
"union", NULL };
static int