Btrfs: fix max_inline mount option

Mitch Harder · masoncl · commit feb5f9658930 · 2014-02-14T13:44:32.000-08:00
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 &lt;mitch.harder@sabayonlinux.org&gt;
Signed-off-by: Chris Mason &lt;clm@fb.com&gt;
diff --git 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);
 				}

Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ int btrfs_parse_options(struct btrfs_root root, char options)`
`566`	`566`	`kfree(num);`
`567`	`567`
`568`	`568`	`if (info->max_inline) {`
`569`		`- info->max_inline = max_t(u64,`
	`569`	`+ info->max_inline = min_t(u64,`
`570`	`570`	`info->max_inline,`
`571`	`571`	`root->sectorsize);`
`572`	`572`	`}`