]> git.hungrycats.org Git - linux/commitdiff
Btrfs: fix unprotected device->bytes_used update
authorMiao Xie <miaox@cn.fujitsu.com>
Wed, 3 Sep 2014 13:35:36 +0000 (21:35 +0800)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Wed, 3 Dec 2014 15:16:48 +0000 (10:16 -0500)
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>
(cherry picked from commit 43530c46cc55cf5a381e788276a93c83cbc95e46)

fs/btrfs/volumes.c

index 43ec093e3765a8234984bebc80ae9182a4300699..73295f69bdfac6835fdb4282fc40d38688be7abf 100644 (file)
@@ -4426,6 +4426,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);
 
@@ -4497,7 +4500,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;