diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-10-10 15:43:32 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-10-10 15:43:32 -0700 |
| commit | f1ca2218881eee7a6f7c9659b837a4c412f8fd06 (patch) | |
| tree | d7a0c9fd32fcba2b523d55799533bc835d4c7ac9 /fs/btrfs/dev-replace.c | |
| parent | 68a531a1dec12708817552dad4eefc5968dd333f (diff) | |
| parent | dc7743aa3c49fabbc6dc9edbcf7df74d776ac32e (diff) | |
Merge tag 'pinctrl-single-for-linus-for-v3.13-signed' into omap-for-v3.13/quirk
Changes to pinctrl-single to allow handling the wake-up
interrupts that most omaps have in each pinctrl register.
As I need these merged also into the omap tree, it was
agreed that I set them up into a separate branch for
both pinctrl tree and linux-omap tree to merge as needed.
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 70681686e8d..9efb94e9585 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, 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 |