Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f5ad7bd authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove fs_info from btrfs_destroy_dev_replace_tgtdev 



This function is always passed a well-formed tgtdevice so the fs_info
can be referenced from there.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarLu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d6507cf1

fs/btrfs/dev-replace.c

+3 −3
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info, 
	dev_replace->srcdev = NULL;

	dev_replace->tgtdev = NULL;

	btrfs_dev_replace_write_unlock(dev_replace);

	btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device);

	btrfs_destroy_dev_replace_tgtdev(tgt_device);

	return ret;

}
@@ -632,7 +632,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
		mutex_unlock(&fs_info->fs_devices->device_list_mutex);

		btrfs_rm_dev_replace_blocked(fs_info);

		if (tgt_device)

			btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device);

			btrfs_destroy_dev_replace_tgtdev(tgt_device);

		btrfs_rm_dev_replace_unblocked(fs_info);

		mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);
@@ -821,7 +821,7 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info) 
		btrfs_dev_name(tgt_device));



	if (tgt_device)

		btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device);

		btrfs_destroy_dev_replace_tgtdev(tgt_device);



leave:

	mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);

fs/btrfs/volumes.c

+2 −3
Original line number Diff line number Diff line
@@ -2063,10 +2063,9 @@ void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info, 
	}

}



void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,

				      struct btrfs_device *tgtdev)

void btrfs_destroy_dev_replace_tgtdev(struct btrfs_device *tgtdev)

{

	struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;

	struct btrfs_fs_devices *fs_devices = tgtdev->fs_info->fs_devices;



	WARN_ON(!tgtdev);

	mutex_lock(&fs_devices->device_list_mutex);

fs/btrfs/volumes.h

+1 −2
Original line number Diff line number Diff line
@@ -455,8 +455,7 @@ 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_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,

				      struct btrfs_device *tgtdev);

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,

			   u64 logical, u64 len);