p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Anand Jain 2014-08-13 14:24:19 +08:00 committed by Chris Mason
parent 56094eecd3
commit d51908ce4e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/btrfs/volumes.c
View File

@ -1815,19 +1815,23 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path)
void btrfs_rm_dev_replace_srcdev(struct btrfs_fs_info *fs_info, void btrfs_rm_dev_replace_srcdev(struct btrfs_fs_info *fs_info,
struct btrfs_device *srcdev) struct btrfs_device *srcdev)
{ {
struct btrfs_fs_devices *fs_devices;
WARN_ON(!mutex_is_locked(&fs_info->fs_devices->device_list_mutex)); 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_list);
list_del_rcu(&srcdev->dev_alloc_list); list_del_rcu(&srcdev->dev_alloc_list);
fs_info->fs_devices->num_devices--; fs_devices->num_devices--;
if (srcdev->missing) { if (srcdev->missing) {
fs_info->fs_devices->missing_devices--; fs_devices->missing_devices--;
fs_info->fs_devices->rw_devices++; fs_devices->rw_devices++;
} }
if (srcdev->can_discard) if (srcdev->can_discard)
fs_info->fs_devices->num_can_discard--; fs_devices->num_can_discard--;
if (srcdev->bdev) { if (srcdev->bdev) {
fs_info->fs_devices->open_devices--; fs_devices->open_devices--;
/* /*
* zero out the old super if it is not writable * zero out the old super if it is not writable