From owner-freebsd-current@FreeBSD.ORG Mon Nov 29 09:26:51 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DAA6A16A4CE; Mon, 29 Nov 2004 09:26:51 +0000 (GMT) Received: from critter.freebsd.dk (critter.freebsd.dk [212.242.86.163]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2686943D64; Mon, 29 Nov 2004 09:26:51 +0000 (GMT) (envelope-from phk@critter.freebsd.dk) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.13.1/8.13.1) with ESMTP id iAT9QoZc028132; Mon, 29 Nov 2004 10:26:50 +0100 (CET) (envelope-from phk@critter.freebsd.dk) To: Ruslan Ermilov From: "Poul-Henning Kamp" In-Reply-To: Your message of "Mon, 29 Nov 2004 11:25:11 +0200." <20041129092510.GA80748@ip.net.ua> Date: Mon, 29 Nov 2004 10:26:50 +0100 Message-ID: <28131.1101720410@critter.freebsd.dk> Sender: phk@critter.freebsd.dk cc: current@FreeBSD.org Subject: Re: [PATCH] mount(8) broken X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2004 09:26:52 -0000 By all means commit it! Poul-Henning In message <20041129092510.GA80748@ip.net.ua>, Ruslan Ermilov writes: > >--f2QGlHpHGjS2mn6Y >Content-Type: multipart/mixed; boundary="pWyiEgJYm5f9v55/" >Content-Disposition: inline > > >--pWyiEgJYm5f9v55/ >Content-Type: text/plain; charset=us-ascii >Content-Disposition: inline >Content-Transfer-Encoding: quoted-printable > >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, >--=20 >Ruslan Ermilov >ru@FreeBSD.org >FreeBSD committer > >--pWyiEgJYm5f9v55/ >Content-Type: text/plain; charset=us-ascii >Content-Disposition: attachment; filename=p > >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 > >--pWyiEgJYm5f9v55/-- > >--f2QGlHpHGjS2mn6Y >Content-Type: application/pgp-signature >Content-Disposition: inline > >-----BEGIN PGP SIGNATURE----- >Version: GnuPG v1.2.6 (FreeBSD) > >iD8DBQFBqur2qRfpzJluFF4RAif4AJ444FY0g+wCKYwPcOo77E8begZG/QCfURc/ >R2dY8qcpORy8q2BeXP23XWU= >=01lk >-----END PGP SIGNATURE----- > >--f2QGlHpHGjS2mn6Y-- > -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence.