Commit 96bdc7dc authored by Chris Mason's avatar Chris Mason
Browse files

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: default avatarChris Mason <chris.mason@oracle.com>
parent f248679e

fs/btrfs/extent-tree.c

+3 −0
Original line number Diff line number Diff line
@@ -3384,6 +3384,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;

fs/btrfs/volumes.c

+1 −1
Original line number Diff line number Diff line
@@ -3166,7 +3166,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",