diff options
author | Christoph Hellwig <hch@lst.de> | 2005-11-09 00:34:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:55:58 -0500 |
commit | 41a34a4fe1d4478b1c8b6b6ea634ab1adb156885 (patch) | |
tree | 18e228df2befa6a8f3e3703cbafea12fed92ac64 /fs/fat/inode.c | |
parent | 33096b1e735b0a36c289ced394da7a25e94bc815 (diff) |
[PATCH] fat: respect silent mount flag
Pass down the silent flag to parse_options(). Without this fat gives
warnings when mounting some non-fat rootfs with options.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/fat/inode.c')
-rw-r--r-- | fs/fat/inode.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index e2effe2dc9b2..a0f9b9fe1307 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
@@ -846,7 +846,7 @@ static match_table_t vfat_tokens = { | |||
846 | {Opt_err, NULL} | 846 | {Opt_err, NULL} |
847 | }; | 847 | }; |
848 | 848 | ||
849 | static int parse_options(char *options, int is_vfat, int *debug, | 849 | static int parse_options(char *options, int is_vfat, int silent, int *debug, |
850 | struct fat_mount_options *opts) | 850 | struct fat_mount_options *opts) |
851 | { | 851 | { |
852 | char *p; | 852 | char *p; |
@@ -1008,8 +1008,11 @@ static int parse_options(char *options, int is_vfat, int *debug, | |||
1008 | break; | 1008 | break; |
1009 | /* unknown option */ | 1009 | /* unknown option */ |
1010 | default: | 1010 | default: |
1011 | printk(KERN_ERR "FAT: Unrecognized mount option \"%s\" " | 1011 | if (!silent) { |
1012 | "or missing value\n", p); | 1012 | printk(KERN_ERR |
1013 | "FAT: Unrecognized mount option \"%s\" " | ||
1014 | "or missing value\n", p); | ||
1015 | } | ||
1013 | return -EINVAL; | 1016 | return -EINVAL; |
1014 | } | 1017 | } |
1015 | } | 1018 | } |
@@ -1091,7 +1094,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, | |||
1091 | sb->s_export_op = &fat_export_ops; | 1094 | sb->s_export_op = &fat_export_ops; |
1092 | sbi->dir_ops = fs_dir_inode_ops; | 1095 | sbi->dir_ops = fs_dir_inode_ops; |
1093 | 1096 | ||
1094 | error = parse_options(data, isvfat, &debug, &sbi->options); | 1097 | error = parse_options(data, isvfat, silent, &debug, &sbi->options); |
1095 | if (error) | 1098 | if (error) |
1096 | goto out_fail; | 1099 | goto out_fail; |
1097 | 1100 | ||