summaryrefslogtreecommitdiff
path: root/fs/btrfs
diff options
context:
space:
mode:
authorMiao Xie <miaox@cn.fujitsu.com>2014-09-03 13:35:36 (GMT)
committerChris Mason <clm@fb.com>2014-09-17 20:38:36 (GMT)
commit43530c46cc55cf5a381e788276a93c83cbc95e46 (patch)
treeecce232a9383ebf44df78e5e677a1861acd3a4fc /fs/btrfs
parent5d778aaeb013bf819d00e33de7c673c04b5c4886 (diff)
downloadlinux-43530c46cc55cf5a381e788276a93c83cbc95e46.tar.xz
Btrfs: fix unprotected device->bytes_used update
We should update device->bytes_used in the lock context of chunk_mutex, or we would get wrong data. 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.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 1524b3f..45e0b5d 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -4429,6 +4429,9 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
if (ret)
goto error_del_extent;
+ for (i = 0; i < map->num_stripes; i++)
+ map->stripes[i].dev->bytes_used += stripe_size;
+
free_extent_map(em);
check_raid56_incompat_flag(extent_root->fs_info, type);
@@ -4500,7 +4503,6 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
device = map->stripes[i].dev;
dev_offset = map->stripes[i].physical;
- device->bytes_used += stripe_size;
ret = btrfs_update_device(trans, device);
if (ret)
goto out;