diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/afs/super.c | 2 | ||||
-rw-r--r-- | fs/cifs/cifsfs.c | 2 | ||||
-rw-r--r-- | fs/jffs2/super.c | 4 | ||||
-rw-r--r-- | fs/nfs/inode.c | 4 | ||||
-rw-r--r-- | fs/super.c | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/fs/afs/super.c b/fs/afs/super.c index d6fa8e5999df..53c56e7231ab 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c | |||
@@ -341,7 +341,7 @@ static struct super_block *afs_get_sb(struct file_system_type *fs_type, | |||
341 | 341 | ||
342 | sb->s_flags = flags; | 342 | sb->s_flags = flags; |
343 | 343 | ||
344 | ret = afs_fill_super(sb, ¶ms, flags & MS_VERBOSE ? 1 : 0); | 344 | ret = afs_fill_super(sb, ¶ms, flags & MS_SILENT ? 1 : 0); |
345 | if (ret < 0) { | 345 | if (ret < 0) { |
346 | up_write(&sb->s_umount); | 346 | up_write(&sb->s_umount); |
347 | deactivate_super(sb); | 347 | deactivate_super(sb); |
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 79eeccd0437f..1cd044ce82a6 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -479,7 +479,7 @@ cifs_get_sb(struct file_system_type *fs_type, | |||
479 | 479 | ||
480 | sb->s_flags = flags; | 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 | if (rc) { | 483 | if (rc) { |
484 | up_write(&sb->s_umount); | 484 | up_write(&sb->s_umount); |
485 | deactivate_super(sb); | 485 | deactivate_super(sb); |
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 93883817cbd0..c8fac352a4cf 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c | |||
@@ -152,7 +152,7 @@ static struct super_block *jffs2_get_sb_mtd(struct file_system_type *fs_type, | |||
152 | sb->s_op = &jffs2_super_operations; | 152 | sb->s_op = &jffs2_super_operations; |
153 | sb->s_flags = flags | MS_NOATIME; | 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 | if (ret) { | 157 | if (ret) { |
158 | /* Failure case... */ | 158 | /* Failure case... */ |
@@ -257,7 +257,7 @@ static struct super_block *jffs2_get_sb(struct file_system_type *fs_type, | |||
257 | } | 257 | } |
258 | 258 | ||
259 | if (imajor(nd.dentry->d_inode) != MTD_BLOCK_MAJOR) { | 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 | printk(KERN_NOTICE "Attempt to mount non-MTD device \"%s\" as JFFS2\n", | 261 | printk(KERN_NOTICE "Attempt to mount non-MTD device \"%s\" as JFFS2\n", |
262 | dev_name); | 262 | dev_name); |
263 | goto out; | 263 | goto out; |
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); |
diff --git a/fs/super.c b/fs/super.c index 425861cb1caa..37554b876182 100644 --- a/fs/super.c +++ b/fs/super.c | |||
@@ -712,7 +712,7 @@ struct super_block *get_sb_bdev(struct file_system_type *fs_type, | |||
712 | s->s_flags = flags; | 712 | s->s_flags = flags; |
713 | strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id)); | 713 | strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id)); |
714 | sb_set_blocksize(s, block_size(bdev)); | 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 | if (error) { | 716 | if (error) { |
717 | up_write(&s->s_umount); | 717 | up_write(&s->s_umount); |
718 | deactivate_super(s); | 718 | deactivate_super(s); |
@@ -756,7 +756,7 @@ struct super_block *get_sb_nodev(struct file_system_type *fs_type, | |||
756 | 756 | ||
757 | s->s_flags = flags; | 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 | if (error) { | 760 | if (error) { |
761 | up_write(&s->s_umount); | 761 | up_write(&s->s_umount); |
762 | deactivate_super(s); | 762 | deactivate_super(s); |
@@ -785,7 +785,7 @@ struct super_block *get_sb_single(struct file_system_type *fs_type, | |||
785 | return s; | 785 | return s; |
786 | if (!s->s_root) { | 786 | if (!s->s_root) { |
787 | s->s_flags = flags; | 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 | if (error) { | 789 | if (error) { |
790 | up_write(&s->s_umount); | 790 | up_write(&s->s_umount); |
791 | deactivate_super(s); | 791 | deactivate_super(s); |