summaryrefslogtreecommitdiffstats
path: root/sys/ufs
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2008-03-26 20:48:07 +0000
committerjhb <jhb@FreeBSD.org>2008-03-26 20:48:07 +0000
commit20cadd93f0e62b205ad8b98371ad5f8079880f71 (patch)
tree71de85df6a9a377e43abc444ff90f8c25d575297 /sys/ufs
parent259c5e15797f2de45550a037ecc64975a86c4fd9 (diff)
downloadFreeBSD-src-20cadd93f0e62b205ad8b98371ad5f8079880f71.zip
FreeBSD-src-20cadd93f0e62b205ad8b98371ad5f8079880f71.tar.gz
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
Diffstat (limited to 'sys/ufs')
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index cc13410..b9e21f2 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -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
OpenPOWER on IntegriCloud