Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41a34a4f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[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: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 33096b1e

fs/fat/inode.c

+7 −4
Original line number Diff line number Diff line
@@ -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\" "

			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;