diff options
| author | Mitch Harder <mitch.harder@sabayonlinux.org> | 2014-02-13 16:13:16 +0100 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-02-14 22:44:32 +0100 |
| commit | feb5f96589302b39a2b10fc210db7c47a73e4168 (patch) | |
| tree | 045b98f0adf5d6cf28610fca020a563c9990020a /fs/btrfs/super.c | |
| parent | Btrfs: fix a lockdep warning when cleaning up aborted transaction (diff) | |
| download | linux-feb5f96589302b39a2b10fc210db7c47a73e4168.tar.xz linux-feb5f96589302b39a2b10fc210db7c47a73e4168.zip | |
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 <mitch.harder@sabayonlinux.org>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |