btrfs: dev-replace: Remove impossible WARN_ON

[linux-2.6-microblaze.git] / fs / btrfs / dev-replace.c

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index ee0989c..eb8b5cb 100644 (file)
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -201,7 +201,7 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
                return PTR_ERR(bdev);
        }
 
-       filemap_write_and_wait(bdev->bd_inode->i_mapping);
+       sync_blockdev(bdev);
 
        devices = &fs_info->fs_devices->devices;
        list_for_each_entry(device, devices, dev_list) {
@@ -237,7 +237,6 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
        }
        rcu_assign_pointer(device->name, name);
 
-       mutex_lock(&fs_info->fs_devices->device_list_mutex);
        set_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);
        device->generation = 0;
        device->io_width = fs_info->sectorsize;
@@ -256,6 +255,8 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
        device->dev_stats_valid = 1;
        set_blocksize(device->bdev, BTRFS_BDEV_BLOCKSIZE);
        device->fs_devices = fs_info->fs_devices;
+
+       mutex_lock(&fs_info->fs_devices->device_list_mutex);
        list_add(&device->dev_list, &fs_info->fs_devices->devices);
        fs_info->fs_devices->num_devices++;
        fs_info->fs_devices->open_devices++;
@@ -446,7 +447,6 @@ static int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
        }
 
        dev_replace->cont_reading_from_srcdev_mode = read_src;
-       WARN_ON(!src_device);
        dev_replace->srcdev = src_device;
        dev_replace->tgtdev = tgt_device;