diff options
| author | Miao Xie <miaox@cn.fujitsu.com> | 2014-09-03 21:35:37 +0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-09-17 13:38:37 -0700 |
| commit | 1c1161870c8bcb0d966ebbf1aec05a87a79a4175 (patch) | |
| tree | af397f11a4cf07440999efb3ccac8d435346b619 /fs/btrfs | |
| parent | 43530c46cc55cf5a381e788276a93c83cbc95e46 (diff) | |
| download | blackbird-op-linux-1c1161870c8bcb0d966ebbf1aec05a87a79a4175.tar.gz blackbird-op-linux-1c1161870c8bcb0d966ebbf1aec05a87a79a4175.zip | |
Btrfs: update free_chunk_space during allocting a new chunk
We should update free_chunk_space in time when we allocate a new chunk,
not when we deal with the pending device update and block group insertion,
because we need the real free_chunk_space data to calculate the reserved
space, if we don't update it in time, we would consider the disk space which
has be allocated as free space, and would use it to do overcommit reservation.
Fix it.
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/volumes.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 45e0b5d0f6dd..d8e4a3d1ad89 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -4432,6 +4432,11 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, for (i = 0; i < map->num_stripes; i++) map->stripes[i].dev->bytes_used += stripe_size; + spin_lock(&extent_root->fs_info->free_chunk_lock); + extent_root->fs_info->free_chunk_space -= (stripe_size * + map->num_stripes); + spin_unlock(&extent_root->fs_info->free_chunk_lock); + free_extent_map(em); check_raid56_incompat_flag(extent_root->fs_info, type); @@ -4515,11 +4520,6 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans, goto out; } - spin_lock(&extent_root->fs_info->free_chunk_lock); - extent_root->fs_info->free_chunk_space -= (stripe_size * - map->num_stripes); - spin_unlock(&extent_root->fs_info->free_chunk_lock); - stripe = &chunk->stripe; for (i = 0; i < map->num_stripes; i++) { device = map->stripes[i].dev; |
