| Message ID | 9049971b8dd554eed0b19134e0642b238792e29b.1543935982.git.dsterba@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Scrub allocations vs reclaim fix | expand |
On 4.12.18 г. 17:11 ч., David Sterba wrote: > We can pass fs_info directly as this is the only member of btrfs_device > that's bing used inside scrub_setup_ctx. > > Signed-off-by: David Sterba <dsterba@suse.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> > --- > 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 bbd1b36f4918..ffcab263e057 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; > > @@ -3878,7 +3877,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); >
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index bbd1b36f4918..ffcab263e057 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; @@ -3878,7 +3877,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);
We can pass fs_info directly as this is the only member of btrfs_device that's bing used inside scrub_setup_ctx. Signed-off-by: David Sterba <dsterba@suse.com> --- fs/btrfs/scrub.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)