lkml.org 
[lkml]   [2019]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 077/167] btrfs: scrub: pass fs_info to scrub_setup_ctx
    Date
    From: David Sterba <dsterba@suse.com>

    [ 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: Nikolay Borisov <nborisov@suse.com>
    Signed-off-by: David Sterba <dsterba@suse.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/btrfs/scrub.c | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
    index 5a2d10ba747f7..efaad3e1b295a 100644
    --- a/fs/btrfs/scrub.c
    +++ b/fs/btrfs/scrub.c
    @@ -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);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-09-03 18:28    [W:4.048 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site