Messages in this thread Patch in this message | | | Date | Tue, 14 Mar 2006 07:59:55 -0500 | From | Theodore Ts'o <> | Subject | [PATCH] Fix backwards meaning of MS_VERBOSE |
| |
On Mon, Mar 13, 2006 at 11:14:07PM -0800, Andrew Morton wrote: > > VFS: Can't find ext3 filesystem on dev loop0. > > That's only printed if the sys_mount() caller set MS_VERBOSE in `flags'.
Well, that and the "ext3: No journal on filesystem on %s" message which Rob also complained about...
I was just looking at this, and it seemed counterintuitive that setting the MS_VERBOSE flag actually means "don't be verbose"; but indeed, this is the way things are, and it's consistently defined as such, starting with fs/super.c and propgated down into all of the various filesystem fs/*/super.c which copied that bit of code.
Interestingly, mount doesn't have a way of setting the MS_VERBOSE flag, but it *does* have the following:
#ifdef MS_SILENT { "quiet", 0, 0, MS_SILENT }, /* be quiet */ { "loud", 0, 1, MS_SILENT }, /* print out messages. */ #endif
.... and fs.h doesn't define MS_SILENT, although it does define the MS_VERBOSE flag which has the exact opposite meaning.
So.... any objections to the following?
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Index: 2.6.16-rc5/include/linux/fs.h =================================================================== --- 2.6.16-rc5.orig/include/linux/fs.h 2006-03-14 07:31:33.000000000 -0500 +++ 2.6.16-rc5/include/linux/fs.h 2006-03-14 07:32:10.000000000 -0500 @@ -102,7 +102,9 @@ #define MS_BIND 4096 #define MS_MOVE 8192 #define MS_REC 16384 -#define MS_VERBOSE 32768 +#define MS_VERBOSE 32768 /* War is peace. Verbosity is silence. + MS_VERBOSE is deprecated. */ +#define MS_SILENT 32768 #define MS_POSIXACL (1<<16) /* VFS does not apply the umask */ #define MS_UNBINDABLE (1<<17) /* change to unbindable */ #define MS_PRIVATE (1<<18) /* change to private */ Index: 2.6.16-rc5/fs/super.c =================================================================== --- 2.6.16-rc5.orig/fs/super.c 2006-03-14 07:31:33.000000000 -0500 +++ 2.6.16-rc5/fs/super.c 2006-03-14 07:54:38.000000000 -0500 @@ -712,7 +712,7 @@ s->s_flags = flags; strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id)); sb_set_blocksize(s, block_size(bdev)); - error = fill_super(s, data, flags & MS_VERBOSE ? 1 : 0); + error = fill_super(s, data, flags & MS_SILENT ? 1 : 0); if (error) { up_write(&s->s_umount); deactivate_super(s); @@ -756,7 +756,7 @@ s->s_flags = flags; - error = fill_super(s, data, flags & MS_VERBOSE ? 1 : 0); + error = fill_super(s, data, flags & MS_SILENT ? 1 : 0); if (error) { up_write(&s->s_umount); deactivate_super(s); @@ -785,7 +785,7 @@ return s; if (!s->s_root) { s->s_flags = flags; - error = fill_super(s, data, flags & MS_VERBOSE ? 1 : 0); + error = fill_super(s, data, flags & MS_SILENT ? 1 : 0); if (error) { up_write(&s->s_umount); deactivate_super(s); Index: 2.6.16-rc5/fs/afs/super.c =================================================================== --- 2.6.16-rc5.orig/fs/afs/super.c 2006-03-14 07:31:33.000000000 -0500 +++ 2.6.16-rc5/fs/afs/super.c 2006-03-14 07:32:10.000000000 -0500 @@ -341,7 +341,7 @@ sb->s_flags = flags; - ret = afs_fill_super(sb, ¶ms, flags & MS_VERBOSE ? 1 : 0); + ret = afs_fill_super(sb, ¶ms, flags & MS_SILENT ? 1 : 0); if (ret < 0) { up_write(&sb->s_umount); deactivate_super(sb); Index: 2.6.16-rc5/fs/cifs/cifsfs.c =================================================================== --- 2.6.16-rc5.orig/fs/cifs/cifsfs.c 2006-03-14 07:31:33.000000000 -0500 +++ 2.6.16-rc5/fs/cifs/cifsfs.c 2006-03-14 07:32:10.000000000 -0500 @@ -479,7 +479,7 @@ sb->s_flags = flags; - rc = cifs_read_super(sb, data, dev_name, flags & MS_VERBOSE ? 1 : 0); + rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0); if (rc) { up_write(&sb->s_umount); deactivate_super(sb); Index: 2.6.16-rc5/fs/jffs2/super.c =================================================================== --- 2.6.16-rc5.orig/fs/jffs2/super.c 2006-03-14 07:31:33.000000000 -0500 +++ 2.6.16-rc5/fs/jffs2/super.c 2006-03-14 07:54:08.000000000 -0500 @@ -152,7 +152,7 @@ sb->s_op = &jffs2_super_operations; sb->s_flags = flags | MS_NOATIME; - ret = jffs2_do_fill_super(sb, data, (flags&MS_VERBOSE)?1:0); + ret = jffs2_do_fill_super(sb, data, flags & MS_SILENT ? 1 : 0); if (ret) { /* Failure case... */ @@ -257,7 +257,7 @@ } if (imajor(nd.dentry->d_inode) != MTD_BLOCK_MAJOR) { - if (!(flags & MS_VERBOSE)) /* Yes I mean this. Strangely */ + if (!(flags & MS_SILENT)) printk(KERN_NOTICE "Attempt to mount non-MTD device \"%s\" as JFFS2\n", dev_name); goto out; Index: 2.6.16-rc5/fs/nfs/inode.c =================================================================== --- 2.6.16-rc5.orig/fs/nfs/inode.c 2006-03-14 07:31:33.000000000 -0500 +++ 2.6.16-rc5/fs/nfs/inode.c 2006-03-14 07:53:28.000000000 -0500 @@ -1679,7 +1679,7 @@ s->s_flags = flags; - error = nfs_fill_super(s, data, flags & MS_VERBOSE ? 1 : 0); + error = nfs_fill_super(s, data, flags & MS_SILENT ? 1 : 0); if (error) { up_write(&s->s_umount); deactivate_super(s); @@ -1996,7 +1996,7 @@ s->s_flags = flags; - error = nfs4_fill_super(s, data, flags & MS_VERBOSE ? 1 : 0); + error = nfs4_fill_super(s, data, flags & MS_SILENT ? 1 : 0); if (error) { up_write(&s->s_umount); deactivate_super(s); Index: 2.6.16-rc5/init/do_mounts.c =================================================================== --- 2.6.16-rc5.orig/init/do_mounts.c 2006-03-11 22:17:00.000000000 -0500 +++ 2.6.16-rc5/init/do_mounts.c 2006-03-14 07:56:49.000000000 -0500 @@ -19,7 +19,7 @@ int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */ -int root_mountflags = MS_RDONLY | MS_VERBOSE; +int root_mountflags = MS_RDONLY | MS_SILENT; char * __initdata root_device_name; static char __initdata saved_root_name[64]; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |