From 44e2059da21861a842a7dfa51051fbe886d2ff57 Mon Sep 17 00:00:00 2001 From: rodrigc Date: Sat, 24 May 2008 00:02:12 +0000 Subject: For the following mount options, do not perform the string to flag conversions here, because we already do them further up in vfs_donmount() in vfs_mount.c async -> MNT_ASYNC force -> MNT_FORCE multilabel -> MNT_MULTILABEL noatime -> MNT_NOATIME noclusterr -> MNT_NOCLUSTERR noclusterw -> MNT_NOCLUSTERW MFC after: 1 month --- sys/ufs/ffs/ffs_vfsops.c | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'sys/ufs/ffs') diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index b9e21f2..448b817 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -162,27 +162,6 @@ ffs_mount(struct mount *mp, struct thread *td) if (vfs_getopt(mp->mnt_optnew, "acls", NULL, NULL) == 0) mntorflags |= MNT_ACLS; - if (vfs_getopt(mp->mnt_optnew, "async", NULL, NULL) == 0) - mntorflags |= MNT_ASYNC; - - if (vfs_getopt(mp->mnt_optnew, "force", NULL, NULL) == 0) - mntorflags |= MNT_FORCE; - - if (vfs_getopt(mp->mnt_optnew, "multilabel", NULL, NULL) == 0) - mntorflags |= MNT_MULTILABEL; - - if (vfs_getopt(mp->mnt_optnew, "noasync", NULL, NULL) == 0) - mntandnotflags |= MNT_ASYNC; - - if (vfs_getopt(mp->mnt_optnew, "noatime", NULL, NULL) == 0) - mntorflags |= MNT_NOATIME; - - if (vfs_getopt(mp->mnt_optnew, "noclusterr", NULL, NULL) == 0) - mntorflags |= MNT_NOCLUSTERR; - - if (vfs_getopt(mp->mnt_optnew, "noclusterw", NULL, NULL) == 0) - mntorflags |= MNT_NOCLUSTERW; - if (vfs_getopt(mp->mnt_optnew, "snapshot", NULL, NULL) == 0) mntorflags |= MNT_SNAPSHOT; -- cgit v1.1