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

Btrfs: make the logic of source device removing more clear 

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Miao Xie 2014-09-03 21:35:44 +08:00 committed by Chris Mason
parent 67a2c45ee7
commit 82372bc816
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/btrfs/dev-replace.c
View File

@ -569,8 +569,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
if (fs_info->fs_devices->latest_bdev == src_device->bdev) if (fs_info->fs_devices->latest_bdev == src_device->bdev)
fs_info->fs_devices->latest_bdev = tgt_device->bdev; fs_info->fs_devices->latest_bdev = tgt_device->bdev;
list_add(&tgt_device->dev_alloc_list, &fs_info->fs_devices->alloc_list); list_add(&tgt_device->dev_alloc_list, &fs_info->fs_devices->alloc_list);
if (src_device->fs_devices->seeding) fs_info->fs_devices->rw_devices++;
fs_info->fs_devices->rw_devices++;
/* replace the sysfs entry */ /* replace the sysfs entry */
btrfs_kobj_rm_device(fs_info, src_device); btrfs_kobj_rm_device(fs_info, src_device);

19
fs/btrfs/volumes.c
View File

@ -1819,23 +1819,18 @@ void btrfs_rm_dev_replace_srcdev(struct btrfs_fs_info *fs_info,
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_devices->num_devices--; fs_devices->num_devices--;
if (srcdev->missing) { if (srcdev->missing)
fs_devices->missing_devices--; fs_devices->missing_devices--;
if (!fs_devices->seeding)
fs_devices->rw_devices++; if (srcdev->writeable) {
fs_devices->rw_devices--;
/* zero out the old super if it is writable */
btrfs_scratch_superblock(srcdev);
} }
if (srcdev->bdev) { if (srcdev->bdev)
fs_devices->open_devices--; fs_devices->open_devices--;
/*
* zero out the old super if it is not writable
* (e.g. seed device)
*/
if (srcdev->writeable)
btrfs_scratch_superblock(srcdev);
}
call_rcu(&srcdev->rcu, free_device); call_rcu(&srcdev->rcu, free_device);
/* /*