diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-10-05 10:51:32 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-10-05 10:51:32 -0400 |
| commit | 1329dfc8bb8932976844438cd5e757c720d6f1ff (patch) | |
| tree | 3ee7f40236ee5fc7961e285089da255caddab38a /fs/btrfs/dev-replace.c | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
| parent | 1357272fc7deeebb7b3c5d1a071562edc273cdaf (diff) | |
Merge branch 'for-linus' into for-linus-3.12
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 70681686e8dc..9efb94e95858 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c | |||
| @@ -535,10 +535,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, | |||
| 535 | list_add(&tgt_device->dev_alloc_list, &fs_info->fs_devices->alloc_list); | 535 | list_add(&tgt_device->dev_alloc_list, &fs_info->fs_devices->alloc_list); |
| 536 | 536 | ||
| 537 | btrfs_rm_dev_replace_srcdev(fs_info, src_device); | 537 | btrfs_rm_dev_replace_srcdev(fs_info, src_device); |
| 538 | if (src_device->bdev) { | 538 | |
| 539 | /* zero out the old super */ | ||
| 540 | btrfs_scratch_superblock(src_device); | ||
| 541 | } | ||
| 542 | /* | 539 | /* |
| 543 | * this is again a consistent state where no dev_replace procedure | 540 | * this is again a consistent state where no dev_replace procedure |
| 544 | * is running, the target device is part of the filesystem, the | 541 | * is running, the target device is part of the filesystem, the |