summaryrefslogtreecommitdiff
path: root/fs/btrfs/volumes.c
diff options
context:
space:
mode:
authorAnand Jain <Anand.Jain@oracle.com>2014-08-13 10:24:19 +0400
committerChris Mason <clm@fb.com>2014-09-18 00:38:04 +0400
commitd51908ce4e5d7f7b07867180e36b9935094b78f2 (patch)
tree86ae036c1c55f0bf9543b3ecea11d075030c2945 /fs/btrfs/volumes.c
parent56094eecd32cbb80d098eee5a7cbd60f39f4b764 (diff)
downloadlinux-d51908ce4e5d7f7b07867180e36b9935094b78f2.tar.xz
btrfs: preparatory to make btrfs_rm_dev_replace_srcdev() seed aware
There is no logical change in this patch, just a preparatory patch, so that changes can be easily reasoned. Signed-off-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
-rw-r--r--fs/btrfs/volumes.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index ff8386eb3367..096b4a3dc5a9 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1815,19 +1815,23 @@ error_undo:
void btrfs_rm_dev_replace_srcdev(struct btrfs_fs_info *fs_info,
struct btrfs_device *srcdev)
{
+ struct btrfs_fs_devices *fs_devices;
+
WARN_ON(!mutex_is_locked(&fs_info->fs_devices->device_list_mutex));
+ fs_devices = fs_info->fs_devices;
+
list_del_rcu(&srcdev->dev_list);
list_del_rcu(&srcdev->dev_alloc_list);
- fs_info->fs_devices->num_devices--;
+ fs_devices->num_devices--;
if (srcdev->missing) {
- fs_info->fs_devices->missing_devices--;
- fs_info->fs_devices->rw_devices++;
+ fs_devices->missing_devices--;
+ fs_devices->rw_devices++;
}
if (srcdev->can_discard)
- fs_info->fs_devices->num_can_discard--;
+ fs_devices->num_can_discard--;
if (srcdev->bdev) {
- fs_info->fs_devices->open_devices--;
+ fs_devices->open_devices--;
/*
* zero out the old super if it is not writable