diff options
| author | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:34 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:34 +0100 |
| commit | fa695b01bceabc40be3267d309ca8a663de53d7a (patch) | |
| tree | 017a66e7b0c2d928d3edc9531cf04bd3debf346a /fs/btrfs/ctree.h | |
| parent | f004fae0cfeb96d33240eb5471f14cb6fbbd4eea (diff) | |
| parent | f7e98a7fff8634ae655c666dc2c9fc55a48d0a73 (diff) | |
| download | op-kernel-dev-fa695b01bceabc40be3267d309ca8a663de53d7a.zip op-kernel-dev-fa695b01bceabc40be3267d309ca8a663de53d7a.tar.gz | |
Merge branch 'misc-4.6' into for-chris-4.6
# Conflicts:
# fs/btrfs/file.c
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 67fca26..c3e6349 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -2291,7 +2291,7 @@ struct btrfs_ioctl_defrag_range_args { #define BTRFS_MOUNT_NOLOGREPLAY (1 << 27) #define BTRFS_DEFAULT_COMMIT_INTERVAL (30) -#define BTRFS_DEFAULT_MAX_INLINE (8192) +#define BTRFS_DEFAULT_MAX_INLINE (2048) #define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt) #define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt) |
