Commit 9b04c997 authored by Theodore Ts'o's avatar Theodore Ts'o Committed by Linus Torvalds
Browse files

[PATCH] 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 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.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6961ec82

fs/afs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static struct super_block *afs_get_sb(struct file_system_type *fs_type, 


	sb->s_flags = flags;



	ret = afs_fill_super(sb, &params, flags & MS_VERBOSE ? 1 : 0);

	ret = afs_fill_super(sb, &params, flags & MS_SILENT ? 1 : 0);

	if (ret < 0) {

		up_write(&sb->s_umount);

		deactivate_super(sb);

fs/cifs/cifsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ cifs_get_sb(struct file_system_type *fs_type, 


	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
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static struct super_block *jffs2_get_sb_mtd(struct file_system_type *fs_type, 
	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(struct file_system_type *fs_type, 
	}



	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
Original line number Diff line number Diff line
@@ -1679,7 +1679,7 @@ static struct super_block *nfs_get_sb(struct file_system_type *fs_type, 


	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(struct file_system_type *fs_type, 


	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);

fs/super.c

+3 −3
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ struct super_block *get_sb_bdev(struct file_system_type *fs_type, 
		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 file_system_type *fs_type, 


	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(struct file_system_type *fs_type, 
		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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE