btrfs: preparatory to make btrfs_rm_dev_replace_srcdev() seed aware
authorAnand Jain <Anand.Jain@oracle.com>
Wed, 13 Aug 2014 06:24:19 +0000 (14:24 +0800)
committerChris Mason <clm@fb.com>
Wed, 17 Sep 2014 20:38:04 +0000 (13:38 -0700)
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>
fs/btrfs/volumes.c

index ff8386eb3367c05b312d98b100d0e4cc82a33a0f..096b4a3dc5a9ad51777eaecbbbff5460ff68128e 100644 (file)
@@ -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