diff options
| author | Chris Mason <chris.mason@oracle.com> | 2008-06-12 00:51:38 +0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 19:04:03 +0400 |
| commit | 15ada040d7cd68d7853938a92b116292cc16a2f3 (patch) | |
| tree | 1453852cc4dff63feb2fe3d9df3b317b531711cb /fs | |
| parent | 8b7128429235d9bd72cfd5ed20c77c4f3118f744 (diff) | |
| download | linux-15ada040d7cd68d7853938a92b116292cc16a2f3.tar.xz | |
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 <chris.mason@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/super.c | 7 |
1 files changed, 5 insertions, 2 deletions
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); } |