diff options
| author | Anand Jain | 2018-04-12 04:29:38 +0200 |
|---|---|---|
| committer | David Sterba | 2018-05-28 18:23:18 +0200 |
| commit | d9a071f0086d22a6bdb57dc5ecbbf65fa20b6e22 (patch) | |
| tree | 17ab7e27dd972d6c5c40b305cddb0915e2905f0d /fs/btrfs/volumes.c | |
| parent | btrfs: drop uuid_mutex in btrfs_destroy_dev_replace_tgtdev (diff) | |
| download | kernel-qcow2-linux-d9a071f0086d22a6bdb57dc5ecbbf65fa20b6e22.tar.gz kernel-qcow2-linux-d9a071f0086d22a6bdb57dc5ecbbf65fa20b6e22.tar.xz kernel-qcow2-linux-d9a071f0086d22a6bdb57dc5ecbbf65fa20b6e22.zip | |
btrfs: use common variable for fs_devices in btrfs_destroy_dev_replace_tgtdev
Use a local btrfs_fs_devices variable to access the structure.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 28715e4c3097..8ed90107b727 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2152,21 +2152,23 @@ void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info, void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, struct btrfs_device *tgtdev) { + struct btrfs_fs_devices *fs_devices = fs_info->fs_devices; + WARN_ON(!tgtdev); - mutex_lock(&fs_info->fs_devices->device_list_mutex); + mutex_lock(&fs_devices->device_list_mutex); - btrfs_sysfs_rm_device_link(fs_info->fs_devices, tgtdev); + btrfs_sysfs_rm_device_link(fs_devices, tgtdev); if (tgtdev->bdev) - fs_info->fs_devices->open_devices--; + fs_devices->open_devices--; - fs_info->fs_devices->num_devices--; + fs_devices->num_devices--; btrfs_assign_next_active_device(fs_info, tgtdev, NULL); list_del_rcu(&tgtdev->dev_list); - mutex_unlock(&fs_info->fs_devices->device_list_mutex); + mutex_unlock(&fs_devices->device_list_mutex); /* * The update_dev_time() with in btrfs_scratch_superblocks() |