leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Btrfs: use larger system chunks

Browse Source 
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 <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2012-01-16 08:13:11 -05:00
parent f248679e86
commit 96bdc7dc61
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/btrfs/extent-tree.c
View File

@ -3384,6 +3384,9 @@ static int should_alloc_chunk(struct btrfs_root *root,
/* 256MB or 2% of the FS */ /* 256MB or 2% of the FS */
thresh = max_t(u64, 256 * 1024 * 1024, div_factor_fine(thresh, 2)); 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)) if (num_bytes > thresh && sinfo->bytes_used < div_factor(num_bytes, 8))
return 0; return 0;

2
fs/btrfs/volumes.c
View File

@ -3166,7 +3166,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
max_stripe_size = 256 * 1024 * 1024; max_stripe_size = 256 * 1024 * 1024;
max_chunk_size = max_stripe_size; max_chunk_size = max_stripe_size;
} else if (type & BTRFS_BLOCK_GROUP_SYSTEM) { } 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; max_chunk_size = 2 * max_stripe_size;
} else { } else {
printk(KERN_ERR "btrfs: invalid chunk type 0x%llx requested\n", printk(KERN_ERR "btrfs: invalid chunk type 0x%llx requested\n",