From: Chris Mason Date: Wed, 11 Jun 2008 20:51:38 +0000 (-0400) Subject: Btrfs: Fix mount -o max_inline=0 X-Git-Tag: Ubuntu-5.10.0-12.13~34628^2~9^2~55^2~56^2~30^2~152 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=15ada040d7cd68d7853938a92b116292cc16a2f3;p=mirror_ubuntu-hirsute-kernel.git Btrfs: Fix mount -o max_inline=0 max_inline=0 used to force the max_inline size to one sector instead. Now it properly disables inline data items, while still being able to read any that happen to exist on disk. Signed-off-by: Chris Mason --- diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 346932e546ba..f3274befd46a 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -184,8 +184,11 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) info->max_inline = btrfs_parse_size(num); kfree(num); - info->max_inline = max_t(u64, - info->max_inline, root->sectorsize); + if (info->max_inline) { + info->max_inline = max_t(u64, + info->max_inline, + root->sectorsize); + } printk(KERN_INFO "btrfs: max_inline at %llu\n", info->max_inline); }