Btrfs: pick the correct metadata allocation size on small devices

Commit Message

Itaru Kitayama Dec. 12, 2010, 2:33 p.m. UTC

None

Patch

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 8c26441..54ab490 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3241,6 +3241,8 @@  static int should_alloc_chunk(struct btrfs_root *root,
                              struct btrfs_space_info *sinfo, u64 alloc_bytes)
 {
        u64 num_bytes = sinfo->total_bytes - sinfo->bytes_readonly;
+       u64 total_rw_bytes = root->fs_info->fs_devices->total_rw_bytes; 
+       u64 max_chunk_size;
        u64 thresh;
 
        if (sinfo->bytes_used + sinfo->bytes_reserved +
@@ -3251,8 +3253,9 @@  static int should_alloc_chunk(struct btrfs_root *root,
            alloc_bytes < div_factor(num_bytes, 8))
                return 0;
 
+       max_chunk_size = min(256 * 1024 * 1024, div_factor(total_rw_bytes, 1));
        thresh = btrfs_super_total_bytes(&root->fs_info->super_copy);
-       thresh = max_t(u64, 256 * 1024 * 1024, div_factor_fine(thresh, 5));
+       thresh = max_t(u64, max_chunk_size, div_factor_fine(thresh, 5));
 
        if (num_bytes > thresh && sinfo->bytes_used < div_factor(num_bytes, 3))
                return 0;