vfs: MS_VERBOSE should be MS_SILENT
Subsystems (4)
PATCH 1/1 vfs: MS_VERBOSE should be MS_SILENT
The meaning of MS_VERBOSE is backwards; if the bit is set, it really means, "don't be verbose". This is confusing and counter-intuitive.
In addition, there is also no way to set the MS_VERBOSE flag in mount, but interesting, the mount(8) program in util-linux, does define expect the existence of an MS_SILENT, which unfortunately we don't define:
#ifdef MS_SILENT
{ "quiet", 0, 0, MS_SILENT }, /* be quiet */
{ "loud", 0, 1, MS_SILENT }, /* print out messages. */#endif
So the obvious fix here is to deprecate the use of MS_VERBOSE and replace it with MS_SILENT.
include/linux/fs.h +3 -1
@@ -102,7 +102,9 @@ extern int dir_notify_enable;#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 */
fs/super.c +3 -3
@@ -712,7 +712,7 @@ struct super_block *get_sb_bdev(struct f 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 @@ struct super_block *get_sb_nodev(struct 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 @@ struct super_block *get_sb_single(structreturn 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);
fs/afs/super.c +1 -1
@@ -341,7 +341,7 @@ static struct super_block *afs_get_sb(st 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);
fs/cifs/cifsfs.c +1 -1
@@ -479,7 +479,7 @@ cifs_get_sb(struct file_system_type *fs_ 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);
fs/jffs2/super.c +2 -2
@@ -152,7 +152,7 @@ static struct super_block *jffs2_get_sb_ 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 @@ static struct super_block *jffs2_get_sb( }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;
fs/nfs/inode.c +2 -2
@@ -1679,7 +1679,7 @@ static struct super_block *nfs_get_sb(st 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 @@ static struct super_block *nfs4_get_sb(s 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);
init/do_mounts.c +1 -1
@@ -19,7 +19,7 @@ extern int get_filesystem_list(char * buint __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 ];
PATCH 1/1 vfs: MS_VERBOSE should be MS_SILENT
[I sent out the wrong version of the patch which didn't have my final updates to the descriptive text, sorry.]
The meaning of MS_VERBOSE is backwards; if the bit is set, it really means, "don't be verbose". This is confusing and counter-intuitive.
In addition, there is also no way to set the MS_VERBOSE flag in the mount(8) program in util-linux, but interesting, it does define options which would do the right thing if MS_SILENT were defined, which unfortunately we do not:
#ifdef MS_SILENT
{ "quiet", 0, 0, MS_SILENT }, /* be quiet */
{ "loud", 0, 1, MS_SILENT }, /* print out messages. */#endif
So the obvious fix is to deprecate the use of MS_VERBOSE and replace it with MS_SILENT.
include/linux/fs.h +3 -1
@@ -102,7 +102,9 @@ extern int dir_notify_enable;#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 */
fs/super.c +3 -3
@@ -712,7 +712,7 @@ struct super_block *get_sb_bdev(struct f 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 @@ struct super_block *get_sb_nodev(struct 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 @@ struct super_block *get_sb_single(structreturn 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);
fs/afs/super.c +1 -1
@@ -341,7 +341,7 @@ static struct super_block *afs_get_sb(st 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);
fs/cifs/cifsfs.c +1 -1
@@ -479,7 +479,7 @@ cifs_get_sb(struct file_system_type *fs_ 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);
fs/jffs2/super.c +2 -2
@@ -152,7 +152,7 @@ static struct super_block *jffs2_get_sb_ 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 @@ static struct super_block *jffs2_get_sb( }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;
fs/nfs/inode.c +2 -2
@@ -1679,7 +1679,7 @@ static struct super_block *nfs_get_sb(st 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 @@ static struct super_block *nfs4_get_sb(s 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);
init/do_mounts.c +1 -1
@@ -19,7 +19,7 @@ extern int get_filesystem_list(char * buint __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 ];