From: Chris Mason Date: Mon, 16 Jan 2012 13:13:11 +0000 (-0500) Subject: Btrfs: use larger system chunks X-Git-Tag: v2.6.39-400.9.0~635 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3a2d360c4f36fa38e5e259f6f1cca10c18802ccd;p=users%2Fjedix%2Flinux-maple.git Btrfs: use larger system chunks system chunks by default are very small. This makes them slightly larger and also fixes the conditional checks to make sure we don't allocate a billion of them at once. Signed-off-by: Chris Mason (cherry picked from commit 96bdc7dc61fb1b1e8e858dafb13abee8482ba064) --- diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 03503c50db56..791e5553dcb8 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -3267,6 +3267,9 @@ static int should_alloc_chunk(struct btrfs_root *root, /* 256MB or 2% of the FS */ thresh = max_t(u64, 256 * 1024 * 1024, div_factor_fine(thresh, 2)); + /* system chunks need a much small threshold */ + if (sinfo->flags & BTRFS_BLOCK_GROUP_SYSTEM) + thresh = 32 * 1024 * 1024; if (num_bytes > thresh && sinfo->bytes_used < div_factor(num_bytes, 8)) return 0; diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index e8f434207f6d..a031201930ac 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2444,7 +2444,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, max_stripe_size = 256 * 1024 * 1024; max_chunk_size = max_stripe_size; } else if (type & BTRFS_BLOCK_GROUP_SYSTEM) { - max_stripe_size = 8 * 1024 * 1024; + max_stripe_size = 32 * 1024 * 1024; max_chunk_size = 2 * max_stripe_size; } else { printk(KERN_ERR "btrfs: invalid chunk type 0x%llx requested\n",