aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2006-03-24 06:15:10 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-24 10:33:15 -0500
commit9b04c997b1120feefa1e6ee8e2902270bc055cd2 (patch)
tree09376b68d11ccce2a1ef53bac25a41a763ad36d0 /fs/nfs
parent6961ec8267d08e21011457b05d2263ec06bdcfe1 (diff)
[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>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index a77ee95b7efb..37e55c328ebc 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1679,7 +1679,7 @@ static struct super_block *nfs_get_sb(struct file_system_type *fs_type,
1679 1679
1680 s->s_flags = flags; 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 if (error) { 1683 if (error) {
1684 up_write(&s->s_umount); 1684 up_write(&s->s_umount);
1685 deactivate_super(s); 1685 deactivate_super(s);
@@ -1996,7 +1996,7 @@ static struct super_block *nfs4_get_sb(struct file_system_type *fs_type,
1996 1996
1997 s->s_flags = flags; 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 if (error) { 2000 if (error) {
2001 up_write(&s->s_umount); 2001 up_write(&s->s_umount);
2002 deactivate_super(s); 2002 deactivate_super(s);