[PATCH] mount(8) broken

[Ruslan Ermilov]

Hi Poul-Henning,

Your recent change to sys/sys/mount.h that made MNT_NODEV zero
broke mount(8) -- the "mount" command doesn't display mount
status anymore.  The attached patch should fix it.

Other instances of MNT_NODEV that need addressing:

	contrib/smbfs/mount_smbfs/mntopts.h
	lib/libc/sys/statfs.2
	lib/libc/sys/mount.2
	share/man/man9/vfs_mount.9
	sys/compat/linprocfs/linprocfs.c
	sys/sys/mount.h


Cheers,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- next part --------------
Index: mount/mntopts.h
===================================================================
RCS file: /home/ncvs/src/sbin/mount/mntopts.h,v
retrieving revision 1.22
diff -u -p -r1.22 mntopts.h
--- mount/mntopts.h	25 Nov 2004 13:31:46 -0000	1.22
+++ mount/mntopts.h	28 Nov 2004 21:21:16 -0000
@@ -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 }
@@ -76,7 +75,6 @@ struct mntopt {
 	MOPT_GROUPQUOTA,						\
 	MOPT_FSTAB_COMPAT,						\
 	MOPT_NOATIME,							\
-	MOPT_NODEV,							\
 	MOPT_NOEXEC,							\
 	MOPT_SUIDDIR,		/* must be before MOPT_NOSUID */	\
 	MOPT_NOSUID,							\
Index: mount/mount.8
===================================================================
RCS file: /home/ncvs/src/sbin/mount/mount.8,v
retrieving revision 1.68
diff -u -p -r1.68 mount.8
--- mount/mount.8	17 May 2004 08:35:42 -0000	1.68
+++ mount/mount.8	28 Nov 2004 21:21:54 -0000
@@ -28,7 +28,7 @@
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
 .\" $FreeBSD: src/sbin/mount/mount.8,v 1.68 2004/05/17 08:35:42 ru Exp $
 .\"
-.Dd April 7, 2003
+.Dd November 26, 2004
 .Dt MOUNT 8
 .Os
 .Sh NAME
@@ -177,12 +177,6 @@ flag.
 Disable read clustering.
 .It Cm noclusterw
 Disable write clustering.
-.It Cm nodev
-Do not interpret character or block special devices on the file system.
-This option is useful for a server that has file systems containing
-special devices for architectures other than its own.
-This option is set automatically when the user does not have super-user
-privileges.
 .It Cm noexec
 Do not allow execution of any binaries on the mounted file system.
 This option is useful for a server that has file systems containing
Index: mount/mount.c
===================================================================
RCS file: /home/ncvs/src/sbin/mount/mount.c,v
retrieving revision 1.66
diff -u -p -r1.66 mount.c
--- mount/mount.c	26 Apr 2004 15:13:45 -0000	1.66
+++ mount/mount.c	28 Nov 2004 21:18:54 -0000
@@ -93,7 +93,6 @@ static struct opt {
 	{ MNT_EXPORTED,		"NFS exported" },
 	{ MNT_LOCAL,		"local" },
 	{ MNT_NOATIME,		"noatime" },
-	{ MNT_NODEV,		"nodev" },
 	{ MNT_NOEXEC,		"noexec" },
 	{ MNT_NOSUID,		"nosuid" },
 	{ MNT_NOSYMFOLLOW,	"nosymfollow" },
@@ -750,7 +749,6 @@ flags2opts(flags)
 	if (flags & MNT_SYNCHRONOUS)	res = catopt(res, "sync");
 	if (flags & MNT_NOEXEC)		res = catopt(res, "noexec");
 	if (flags & MNT_NOSUID)		res = catopt(res, "nosuid");
-	if (flags & MNT_NODEV)		res = catopt(res, "nodev");
 	if (flags & MNT_UNION)		res = catopt(res, "union");
 	if (flags & MNT_ASYNC)		res = catopt(res, "async");
 	if (flags & MNT_NOATIME)	res = catopt(res, "noatime");
Index: mount_std/mount_std.8
===================================================================
RCS file: /home/ncvs/src/sbin/mount_std/mount_std.8,v
retrieving revision 1.22
diff -u -p -r1.22 mount_std.8
--- mount_std/mount_std.8	2 Jul 2004 21:45:04 -0000	1.22
+++ mount_std/mount_std.8	29 Nov 2004 09:12:04 -0000
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.22 2004/07/02 21:45:04 ru Exp $
 .\"
-.Dd May 13, 1996
+.Dd November 26, 2004
 .Dt MOUNT_STD 8
 .Os
 .Sh NAME
@@ -70,7 +70,6 @@ accepts only the standard
 options
 .Dq ro ,
 .Dq rw ,
-.Dq nodev ,
 .Dq noexec ,
 .Dq nosuid ,
 and
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20041129/957c70d1/attachment.bin