Commit 313b0858 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: move btrfs_scratch_superblocks into btrfs_dev_replace_finishing 



We need to move the closing of the src_device out of all the device
replace locking, but we definitely want to zero out the superblock
before we commit the last time to make sure the device is properly
removed.  Handle this by pushing btrfs_scratch_superblocks into
btrfs_dev_replace_finishing, and then later on we'll move the src_device
closing and freeing stuff where we need it to be.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent b5ddcffa

fs/btrfs/dev-replace.c

+3 −0
Original line number Diff line number Diff line
@@ -745,6 +745,9 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
	/* replace the sysfs entry */

	btrfs_sysfs_remove_devices_dir(fs_info->fs_devices, src_device);

	btrfs_sysfs_update_devid(tgt_device);

	if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &src_device->dev_state))

		btrfs_scratch_superblocks(fs_info, src_device->bdev,

					  src_device->name->str);

	btrfs_rm_dev_replace_free_srcdev(src_device);



	/* write back the superblocks */

fs/btrfs/volumes.c

+3 −9
Original line number Diff line number Diff line
@@ -1999,7 +1999,7 @@ static u64 btrfs_num_devices(struct btrfs_fs_info *fs_info) 
	return num_devices;

}



static void btrfs_scratch_superblocks(struct btrfs_fs_info *fs_info,

void btrfs_scratch_superblocks(struct btrfs_fs_info *fs_info,

			       struct block_device *bdev,

			       const char *device_path)

{
@@ -2224,12 +2224,6 @@ void btrfs_rm_dev_replace_free_srcdev(struct btrfs_device *srcdev) 
	struct btrfs_fs_info *fs_info = srcdev->fs_info;

	struct btrfs_fs_devices *fs_devices = srcdev->fs_devices;



	if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &srcdev->dev_state)) {

		/* zero out the old super if it is writable */

		btrfs_scratch_superblocks(fs_info, srcdev->bdev,

					  srcdev->name->str);

	}



	btrfs_close_bdev(srcdev);

	synchronize_rcu();

	btrfs_free_device(srcdev);

fs/btrfs/volumes.h

+3 −0
Original line number Diff line number Diff line
@@ -573,6 +573,9 @@ void btrfs_set_fs_info_ptr(struct btrfs_fs_info *fs_info); 
void btrfs_reset_fs_info_ptr(struct btrfs_fs_info *fs_info);

bool btrfs_check_rw_degradable(struct btrfs_fs_info *fs_info,

					struct btrfs_device *failing_dev);

void btrfs_scratch_superblocks(struct btrfs_fs_info *fs_info,

			       struct block_device *bdev,

			       const char *device_path);



int btrfs_bg_type_to_factor(u64 flags);

const char *btrfs_bg_type_to_raid_name(u64 flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE