aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Rodrigues <rodrigc@FreeBSD.org>2005-11-29 00:28:17 +0000
committerCraig Rodrigues <rodrigc@FreeBSD.org>2005-11-29 00:28:17 +0000
commit2207c7648e0d6f8e27f92132fdc7c220fb380e4b (patch)
tree7a410e336c43f675291a4776eaacd0a96ccf88b1
parent99b41b34fb02b1bc07d75fd22ffedd49c6d9b68c (diff)
downloadsrc-2207c7648e0d6f8e27f92132fdc7c220fb380e4b.tar.gz
src-2207c7648e0d6f8e27f92132fdc7c220fb380e4b.zip
Remove MNT_NODEV mount option. In RELENG_6, MNT_NODEV was a no-op.
The presence of MNT_NODEV was confusing the am-utils autoconf scripts. PR: conf/79715
Notes
Notes: svn path=/head/; revision=152912
-rw-r--r--sbin/mount/mntopts.h2
-rw-r--r--sys/compat/linprocfs/linprocfs.c1
-rw-r--r--sys/sys/mount.h1
3 files changed, 0 insertions, 4 deletions
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 13a3b532664f..83704462712d 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -40,7 +40,6 @@ struct mntopt {
/* User-visible MNT_ flags. */
#define MOPT_ASYNC { "async", 0, MNT_ASYNC, 0 }
#define MOPT_NOATIME { "atime", 1, MNT_NOATIME, 0 }
-#define MOPT_NODEV { "dev", 1, MNT_NODEV, 0 }
#define MOPT_NOEXEC { "exec", 1, MNT_NOEXEC, 0 }
#define MOPT_NOSUID { "suid", 1, MNT_NOSUID, 0 }
#define MOPT_NOSYMFOLLOW { "symfollow", 1, MNT_NOSYMFOLLOW, 0 }
@@ -79,7 +78,6 @@ struct mntopt {
MOPT_GROUPQUOTA, \
MOPT_FSTAB_COMPAT, \
MOPT_NOATIME, \
- MOPT_NODEV, \
MOPT_NOEXEC, \
MOPT_SUIDDIR, /* must be before MOPT_NOSUID */ \
MOPT_NOSUID, \
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index bdb51081afc2..885423358f6b 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -395,7 +395,6 @@ linprocfs_domtab(PFS_FILL_ARGS)
ADD_OPTION(MNT_SYNCHRONOUS, "sync");
ADD_OPTION(MNT_NOEXEC, "noexec");
ADD_OPTION(MNT_NOSUID, "nosuid");
- ADD_OPTION(MNT_NODEV, "nodev");
ADD_OPTION(MNT_UNION, "union");
ADD_OPTION(MNT_ASYNC, "async");
ADD_OPTION(MNT_SUIDDIR, "suiddir");
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 300285de01d7..8e410b39d315 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -182,7 +182,6 @@ struct vnode *__mnt_vnode_next(struct vnode **nvp, struct mount *mp);
#define MNT_SYNCHRONOUS 0x00000002 /* filesystem written synchronously */
#define MNT_NOEXEC 0x00000004 /* can't exec from filesystem */
#define MNT_NOSUID 0x00000008 /* don't honor setuid bits on fs */
-#define MNT_NODEV 0 /* Deprecated option */
#define MNT_UNION 0x00000020 /* union with underlying filesystem */
#define MNT_ASYNC 0x00000040 /* filesystem written asynchronously */
#define MNT_SUIDDIR 0x00100000 /* special handling of SUID on dirs */