Commit 163e97ee authored by David Sterba's avatar David Sterba
Browse files

btrfs: get fs_info from device in btrfs_scrub_cancel_dev 



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 f331a952

fs/btrfs/ctree.h

+1 −2
Original line number Diff line number Diff line
@@ -3752,8 +3752,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, 
void btrfs_scrub_pause(struct btrfs_fs_info *fs_info);

void btrfs_scrub_continue(struct btrfs_fs_info *fs_info);

int btrfs_scrub_cancel(struct btrfs_fs_info *info);

int btrfs_scrub_cancel_dev(struct btrfs_fs_info *info,

			   struct btrfs_device *dev);

int btrfs_scrub_cancel_dev(struct btrfs_device *dev);

int btrfs_scrub_progress(struct btrfs_fs_info *fs_info, u64 devid,

			 struct btrfs_scrub_progress *progress);

static inline void btrfs_init_full_stripe_locks_tree(

fs/btrfs/scrub.c

+2 −2
Original line number Diff line number Diff line
@@ -3999,9 +3999,9 @@ int btrfs_scrub_cancel(struct btrfs_fs_info *fs_info) 
	return 0;

}



int btrfs_scrub_cancel_dev(struct btrfs_fs_info *fs_info,

			   struct btrfs_device *dev)

int btrfs_scrub_cancel_dev(struct btrfs_device *dev)

{

	struct btrfs_fs_info *fs_info = dev->fs_info;

	struct scrub_ctx *sctx;



	mutex_lock(&fs_info->scrub_lock);

fs/btrfs/volumes.c

+1 −1
Original line number Diff line number Diff line
@@ -2149,7 +2149,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path, 
		goto error_undo;



	clear_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &device->dev_state);

	btrfs_scrub_cancel_dev(fs_info, device);

	btrfs_scrub_cancel_dev(device);



	/*

	 * the device list mutex makes sure that we don't change