From: Mitch Harder Date: Thu, 13 Feb 2014 15:13:16 +0000 (-0600) Subject: Btrfs: fix max_inline mount option X-Git-Tag: v3.14-rc3~1^2~3 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=feb5f96589302b39a2b10fc210db7c47a73e4168;p=users%2Fjedix%2Flinux-maple.git Btrfs: fix max_inline mount option Currently, the only mount option for max_inline that has any effect is max_inline=0. Any other value that is supplied to max_inline will be adjusted to a minimum of 4k. Since max_inline has an effective maximum of ~3900 bytes due to page size limitations, the current behaviour only has meaning for max_inline=0. This patch will allow the the max_inline mount option to accept non-zero values as indicated in the documentation. Signed-off-by: Mitch Harder Signed-off-by: Chris Mason --- diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 97cc24198554..e73c80eec11b 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -566,7 +566,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) kfree(num); if (info->max_inline) { - info->max_inline = max_t(u64, + info->max_inline = min_t(u64, info->max_inline, root->sectorsize); }