From: Miao Xie Date: Wed, 3 Sep 2014 13:35:35 +0000 (+0800) Subject: Btrfs: Fix wrong free_chunk_space assignment during removing a device X-Git-Tag: firefly_0821_release~176^2~2834^2~56 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d778aaeb013bf819d00e33de7c673c04b5c4886;p=firefly-linux-kernel-4.4.55.git Btrfs: Fix wrong free_chunk_space assignment during removing a device During removing a device, we have modified free_chunk_space when we shrink the device, so we needn't assign a new value to it after the device shrink. Fix it. Signed-off-by: Miao Xie Signed-off-by: Chris Mason --- diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index f8273bb53b3f..1524b3f44036 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1671,11 +1671,6 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) if (ret) goto error_undo; - spin_lock(&root->fs_info->free_chunk_lock); - root->fs_info->free_chunk_space = device->total_bytes - - device->bytes_used; - spin_unlock(&root->fs_info->free_chunk_lock); - device->in_fs_metadata = 0; btrfs_scrub_cancel_dev(root->fs_info, device);