aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilipe David Borba Manana <fdmanana@gmail.com>2013-08-08 17:45:48 -0400
committerDavid Sterba <dsterba@suse.cz>2014-10-02 11:29:24 -0400
commit95ac567af212db3293af3897ccb521efdf1dd7ff (patch)
treefaed6311cacc75c0aca34203b4674690d56bb448
parent143f363618558478fd7b5156c343d21e74194987 (diff)
Btrfs: set default max_inline to 8KiB instead of 8MiB
8MiB is way too large and likely set by mistake. This is not a significant issue as in practice the max amount of data added to an inline extent is also limited by the page cache and btree leaf sizes. Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com> Reviewed-by: David Sterba <dsterba@suse.cz> Signed-off-by: David Sterba <dsterba@suse.cz>
-rw-r--r--fs/btrfs/ctree.h1
-rw-r--r--fs/btrfs/disk-io.c2
-rw-r--r--fs/btrfs/super.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 089f6da09411..dd79ba7ee3ea 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2089,6 +2089,7 @@ struct btrfs_ioctl_defrag_range_args {
2089#define BTRFS_MOUNT_CHANGE_INODE_CACHE (1 << 24) 2089#define BTRFS_MOUNT_CHANGE_INODE_CACHE (1 << 24)
2090 2090
2091#define BTRFS_DEFAULT_COMMIT_INTERVAL (30) 2091#define BTRFS_DEFAULT_COMMIT_INTERVAL (30)
2092#define BTRFS_DEFAULT_MAX_INLINE (8192)
2092 2093
2093#define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt) 2094#define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt)
2094#define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt) 2095#define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 4780e6623c7b..9b2a741370b7 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2260,7 +2260,7 @@ int open_ctree(struct super_block *sb,
2260 atomic_set(&fs_info->qgroup_op_seq, 0); 2260 atomic_set(&fs_info->qgroup_op_seq, 0);
2261 atomic64_set(&fs_info->tree_mod_seq, 0); 2261 atomic64_set(&fs_info->tree_mod_seq, 0);
2262 fs_info->sb = sb; 2262 fs_info->sb = sb;
2263 fs_info->max_inline = 8192 * 1024; 2263 fs_info->max_inline = BTRFS_DEFAULT_MAX_INLINE;
2264 fs_info->metadata_ratio = 0; 2264 fs_info->metadata_ratio = 0;
2265 fs_info->defrag_inodes = RB_ROOT; 2265 fs_info->defrag_inodes = RB_ROOT;
2266 fs_info->free_chunk_space = 0; 2266 fs_info->free_chunk_space = 0;
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 1c6da8e00c1b..b1d2a42f379d 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1014,7 +1014,7 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)
1014 seq_puts(seq, ",nodatacow"); 1014 seq_puts(seq, ",nodatacow");
1015 if (btrfs_test_opt(root, NOBARRIER)) 1015 if (btrfs_test_opt(root, NOBARRIER))
1016 seq_puts(seq, ",nobarrier"); 1016 seq_puts(seq, ",nobarrier");
1017 if (info->max_inline != 8192 * 1024) 1017 if (info->max_inline != BTRFS_DEFAULT_MAX_INLINE)
1018 seq_printf(seq, ",max_inline=%llu", info->max_inline); 1018 seq_printf(seq, ",max_inline=%llu", info->max_inline);
1019 if (info->alloc_start != 0) 1019 if (info->alloc_start != 0)
1020 seq_printf(seq, ",alloc_start=%llu", info->alloc_start); 1020 seq_printf(seq, ",alloc_start=%llu", info->alloc_start);