]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] fat: respect silent mount flag
authorChristoph Hellwig <hch@lst.de>
Wed, 9 Nov 2005 05:34:57 +0000 (21:34 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 15:55:58 +0000 (07:55 -0800)
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>
fs/fat/inode.c

index e2effe2dc9b2c44a7e2c07a2b6fe9b97bfbd7c2a..a0f9b9fe1307addd7ba1bef750ab1fac49abfea7 100644 (file)
@@ -846,7 +846,7 @@ static match_table_t vfat_tokens = {
        {Opt_err, NULL}
 };
 
-static int parse_options(char *options, int is_vfat, int *debug,
+static int parse_options(char *options, int is_vfat, int silent, int *debug,
                         struct fat_mount_options *opts)
 {
        char *p;
@@ -1008,8 +1008,11 @@ static int parse_options(char *options, int is_vfat, int *debug,
                        break;
                /* unknown option */
                default:
-                       printk(KERN_ERR "FAT: Unrecognized mount option \"%s\" "
-                              "or missing value\n", p);
+                       if (!silent) {
+                               printk(KERN_ERR
+                                      "FAT: Unrecognized mount option \"%s\" "
+                                      "or missing value\n", p);
+                       }
                        return -EINVAL;
                }
        }
@@ -1091,7 +1094,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
        sb->s_export_op = &fat_export_ops;
        sbi->dir_ops = fs_dir_inode_ops;
 
-       error = parse_options(data, isvfat, &debug, &sbi->options);
+       error = parse_options(data, isvfat, silent, &debug, &sbi->options);
        if (error)
                goto out_fail;