Commit 65237ee3 authored by David Sterba's avatar David Sterba
Browse files

btrfs: get fs_info from device in btrfs_rm_dev_replace_free_srcdev 



We can read fs_info from the device and can drop it from the parameters.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 163e97ee

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 


	/* replace the sysfs entry */

	btrfs_sysfs_rm_device_link(fs_info->fs_devices, src_device);

	btrfs_rm_dev_replace_free_srcdev(fs_info, src_device);

	btrfs_rm_dev_replace_free_srcdev(src_device);



	/* write back the superblocks */

	trans = btrfs_start_transaction(root, 0);

fs/btrfs/volumes.c

+2 −2
Original line number Diff line number Diff line
@@ -2258,9 +2258,9 @@ void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_device *srcdev) 
		fs_devices->open_devices--;

}



void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info,

				      struct btrfs_device *srcdev)

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)) {

fs/btrfs/volumes.h

+1 −2
Original line number Diff line number Diff line
@@ -464,8 +464,7 @@ void btrfs_init_devices_late(struct btrfs_fs_info *fs_info); 
int btrfs_init_dev_stats(struct btrfs_fs_info *fs_info);

int btrfs_run_dev_stats(struct btrfs_trans_handle *trans);

void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_device *srcdev);

void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info,

				      struct btrfs_device *srcdev);

void btrfs_rm_dev_replace_free_srcdev(struct btrfs_device *srcdev);

void btrfs_destroy_dev_replace_tgtdev(struct btrfs_device *tgtdev);

void btrfs_scratch_superblocks(struct block_device *bdev, const char *device_path);

int btrfs_is_parity_mirror(struct btrfs_fs_info *fs_info,

CRA Git | Maintained and supported by SUSTech CRA and CCSE