mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 10:29:37 +00:00
Code Issues Releases Wiki Activity

btrfs: manage metadata_ratio mount option as %u

Browse source 
As metadata_ratio mount option is unsinged so manage it as %u for token
verifications, instead of %d.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain 2018-02-13 17:50:44 +08:00 committed by David Sterba
parent f7b885befd
commit 764cb8b43d
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fs/btrfs/super.c
View file

@ -361,7 +361,7 @@ static const match_table_t tokens = {
{Opt_norecovery, "norecovery"}, {Opt_norecovery, "norecovery"},
{Opt_flushoncommit, "flushoncommit"}, {Opt_flushoncommit, "flushoncommit"},
{Opt_noflushoncommit, "noflushoncommit"}, {Opt_noflushoncommit, "noflushoncommit"},
{Opt_ratio, "metadata_ratio=%d"}, {Opt_ratio, "metadata_ratio=%u"},
{Opt_discard, "discard"}, {Opt_discard, "discard"},
{Opt_nodiscard, "nodiscard"}, {Opt_nodiscard, "nodiscard"},
{Opt_space_cache, "space_cache"}, {Opt_space_cache, "space_cache"},
@ -657,16 +657,11 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options,
break; break;
case Opt_ratio: case Opt_ratio:
ret = match_int(&args[0], &intarg); ret = match_int(&args[0], &intarg);
if (ret) { if (ret)
goto out; goto out;
} else if (intarg >= 0) { info->metadata_ratio = intarg;
info->metadata_ratio = intarg; btrfs_info(info, "metadata ratio %u",
btrfs_info(info, "metadata ratio %d", info->metadata_ratio);
info->metadata_ratio);
} else {
ret = -EINVAL;
goto out;
}
break; break;
case Opt_discard: case Opt_discard:
btrfs_set_and_info(info, DISCARD, btrfs_set_and_info(info, DISCARD,
@ -1339,8 +1334,7 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)
info->check_integrity_print_mask); info->check_integrity_print_mask);
#endif #endif
if (info->metadata_ratio) if (info->metadata_ratio)
seq_printf(seq, ",metadata_ratio=%d", seq_printf(seq, ",metadata_ratio=%u", info->metadata_ratio);
info->metadata_ratio);
if (btrfs_test_opt(info, PANIC_ON_FATAL_ERROR)) if (btrfs_test_opt(info, PANIC_ON_FATAL_ERROR))
seq_puts(seq, ",fatal_errors=panic"); seq_puts(seq, ",fatal_errors=panic");
if (info->commit_interval != BTRFS_DEFAULT_COMMIT_INTERVAL) if (info->commit_interval != BTRFS_DEFAULT_COMMIT_INTERVAL)