GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-03 21:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'for-linus' into for-linus-3.12

Browse source
This commit is contained in:
Chris Mason 2013-10-05 10:51:32 -04:00
commit 1329dfc8bb
6 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fs/btrfs/dev-replace.c
View file

@ -535,10 +535,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
list_add(&tgt_device->dev_alloc_list, &fs_info->fs_devices->alloc_list);
btrfs_rm_dev_replace_srcdev(fs_info, src_device);
if (src_device->bdev) {
/* zero out the old super */
btrfs_scratch_superblock(src_device);
}
/*
* this is again a consistent state where no dev_replace procedure
* is running, the target device is part of the filesystem, the