diff options
| author | Anand Jain <anand.jain@oracle.com> | 2016-05-03 17:44:43 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-05-04 10:41:08 +0200 |
| commit | 88acff64c621aaeee2a4fe0ed124c77358069bce (patch) | |
| tree | bcb38903c2ae7e890fcc752f2ff3cd6a162025c3 /fs/btrfs/dev-replace.c | |
| parent | 8ed01abe7da6af62f2089da9a4c1fe839dc638f5 (diff) | |
| download | lwn-88acff64c621aaeee2a4fe0ed124c77358069bce.tar.gz lwn-88acff64c621aaeee2a4fe0ed124c77358069bce.zip | |
btrfs: cleanup assigning next active device with a check
Creates helper fucntion as needed by the device delete
and replace operations. Also now it checks if the next
device being assigned is an active device.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index c93eec9ca433..1f193f742f21 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -569,11 +569,9 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, ASSERT(list_empty(&src_device->resized_list)); tgt_device->commit_total_bytes = src_device->commit_total_bytes; tgt_device->commit_bytes_used = src_device->bytes_used; - if (fs_info->sb->s_bdev && - (fs_info->sb->s_bdev == src_device->bdev)) - fs_info->sb->s_bdev = tgt_device->bdev; - if (fs_info->fs_devices->latest_bdev == src_device->bdev) - fs_info->fs_devices->latest_bdev = tgt_device->bdev; + + btrfs_assign_next_active_device(fs_info, src_device, tgt_device); + list_add(&tgt_device->dev_alloc_list, &fs_info->fs_devices->alloc_list); fs_info->fs_devices->rw_devices++; |