Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9b04c997b1120feefa1e6ee8e2902270bc055cd2

Authored by Theodore Ts'o
Committed by Linus Torvalds
1 parent 6961ec8267
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 7 changed files with 13 additions and 11 deletions Side-by-side Diff

... ... @@ -341,7 +341,7 @@
341 341  
342 342 sb->s_flags = flags;
343 343  
344   - ret = afs_fill_super(sb, &params, flags & MS_VERBOSE ? 1 : 0);
  344 + ret = afs_fill_super(sb, &params, flags & MS_SILENT ? 1 : 0);
345 345 if (ret < 0) {
346 346 up_write(&sb->s_umount);
347 347 deactivate_super(sb);
... ... @@ -479,7 +479,7 @@
479 479  
480 480 sb->s_flags = flags;
481 481  
482   - rc = cifs_read_super(sb, data, dev_name, flags & MS_VERBOSE ? 1 : 0);
  482 + rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0);
483 483 if (rc) {
484 484 up_write(&sb->s_umount);
485 485 deactivate_super(sb);
... ... @@ -152,7 +152,7 @@
152 152 sb->s_op = &jffs2_super_operations;
153 153 sb->s_flags = flags | MS_NOATIME;
154 154  
155   - ret = jffs2_do_fill_super(sb, data, (flags&MS_VERBOSE)?1:0);
  155 + ret = jffs2_do_fill_super(sb, data, flags & MS_SILENT ? 1 : 0);
156 156  
157 157 if (ret) {
158 158 /* Failure case... */
... ... @@ -257,7 +257,7 @@
257 257 }
258 258  
259 259 if (imajor(nd.dentry->d_inode) != MTD_BLOCK_MAJOR) {
260   - if (!(flags & MS_VERBOSE)) /* Yes I mean this. Strangely */
  260 + if (!(flags & MS_SILENT))
261 261 printk(KERN_NOTICE "Attempt to mount non-MTD device \"%s\" as JFFS2\n",
262 262 dev_name);
263 263 goto out;
... ... @@ -1679,7 +1679,7 @@
1679 1679  
1680 1680 s->s_flags = flags;
1681 1681  
1682   - error = nfs_fill_super(s, data, flags & MS_VERBOSE ? 1 : 0);
  1682 + error = nfs_fill_super(s, data, flags & MS_SILENT ? 1 : 0);
1683 1683 if (error) {
1684 1684 up_write(&s->s_umount);
1685 1685 deactivate_super(s);
... ... @@ -1996,7 +1996,7 @@
1996 1996  
1997 1997 s->s_flags = flags;
1998 1998  
1999   - error = nfs4_fill_super(s, data, flags & MS_VERBOSE ? 1 : 0);
  1999 + error = nfs4_fill_super(s, data, flags & MS_SILENT ? 1 : 0);
2000 2000 if (error) {
2001 2001 up_write(&s->s_umount);
2002 2002 deactivate_super(s);
... ... @@ -712,7 +712,7 @@
712 712 s->s_flags = flags;
713 713 strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id));
714 714 sb_set_blocksize(s, block_size(bdev));
715   - error = fill_super(s, data, flags & MS_VERBOSE ? 1 : 0);
  715 + error = fill_super(s, data, flags & MS_SILENT ? 1 : 0);
716 716 if (error) {
717 717 up_write(&s->s_umount);
718 718 deactivate_super(s);
... ... @@ -756,7 +756,7 @@
756 756  
757 757 s->s_flags = flags;
758 758  
759   - error = fill_super(s, data, flags & MS_VERBOSE ? 1 : 0);
  759 + error = fill_super(s, data, flags & MS_SILENT ? 1 : 0);
760 760 if (error) {
761 761 up_write(&s->s_umount);
762 762 deactivate_super(s);
... ... @@ -785,7 +785,7 @@
785 785 return s;
786 786 if (!s->s_root) {
787 787 s->s_flags = flags;
788   - error = fill_super(s, data, flags & MS_VERBOSE ? 1 : 0);
  788 + error = fill_super(s, data, flags & MS_SILENT ? 1 : 0);
789 789 if (error) {
790 790 up_write(&s->s_umount);
791 791 deactivate_super(s);
... ... @@ -103,7 +103,9 @@
103 103 #define MS_BIND 4096
104 104 #define MS_MOVE 8192
105 105 #define MS_REC 16384
106   -#define MS_VERBOSE 32768
  106 +#define MS_VERBOSE 32768 /* War is peace. Verbosity is silence.
  107 + MS_VERBOSE is deprecated. */
  108 +#define MS_SILENT 32768
107 109 #define MS_POSIXACL (1<<16) /* VFS does not apply the umask */
108 110 #define MS_UNBINDABLE (1<<17) /* change to unbindable */
109 111 #define MS_PRIVATE (1<<18) /* change to private */
... ... @@ -19,7 +19,7 @@
19 19  
20 20 int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */
21 21  
22   -int root_mountflags = MS_RDONLY | MS_VERBOSE;
  22 +int root_mountflags = MS_RDONLY | MS_SILENT;
23 23 char * __initdata root_device_name;
24 24 static char __initdata saved_root_name[64];
25 25