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

Commit 8ba3169d authored by David Sterba's avatar David Sterba Committed by Greg Kroah-Hartman
Browse files

btrfs: scrub: pass fs_info to scrub_setup_ctx 



[ Upstream commit 92f7ba434f51e8e9317f1d166105889aa230abd2 ]

We can pass fs_info directly as this is the only member of btrfs_device
that's bing used inside scrub_setup_ctx.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent df732920

fs/btrfs/scrub.c

+4 −5
Original line number Diff line number Diff line
@@ -578,12 +578,11 @@ static void scrub_put_ctx(struct scrub_ctx *sctx) 
		scrub_free_ctx(sctx);

}



static noinline_for_stack

struct scrub_ctx *scrub_setup_ctx(struct btrfs_device *dev, int is_dev_replace)

static noinline_for_stack struct scrub_ctx *scrub_setup_ctx(

		struct btrfs_fs_info *fs_info, int is_dev_replace)

{

	struct scrub_ctx *sctx;

	int		i;

	struct btrfs_fs_info *fs_info = dev->fs_info;



	sctx = kzalloc(sizeof(*sctx), GFP_KERNEL);

	if (!sctx)
@@ -592,7 +591,7 @@ struct scrub_ctx *scrub_setup_ctx(struct btrfs_device *dev, int is_dev_replace) 
	sctx->is_dev_replace = is_dev_replace;

	sctx->pages_per_rd_bio = SCRUB_PAGES_PER_RD_BIO;

	sctx->curr = -1;

	sctx->fs_info = dev->fs_info;

	sctx->fs_info = fs_info;

	for (i = 0; i < SCRUB_BIOS_PER_SCTX; ++i) {

		struct scrub_bio *sbio;
@@ -3881,7 +3880,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, 
		return ret;

	}



	sctx = scrub_setup_ctx(dev, is_dev_replace);

	sctx = scrub_setup_ctx(fs_info, is_dev_replace);

	if (IS_ERR(sctx)) {

		mutex_unlock(&fs_info->scrub_lock);

		mutex_unlock(&fs_info->fs_devices->device_list_mutex);