diff options
| author | David Sterba <dsterba@suse.com> | 2017-06-26 16:19:00 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-06-29 21:17:02 +0300 |
| commit | ded56184a562b925a588b6e78688e2e60757b425 (patch) | |
| tree | ba83cb171ab7f1ff717f292115b688a1446199a5 /fs/btrfs | |
| parent | bc42bda22345efdb5d8b578d1b4df2c6eaa85c58 (diff) | |
| download | linux-ded56184a562b925a588b6e78688e2e60757b425.tar.xz | |
btrfs: scrub: fix target device intialization while setting up scrub context
The commit "btrfs: scrub: inline helper scrub_setup_wr_ctx" inlined a
helper but wrongly sets up the target device. Incidentally there's a
local variable with the same name as a parameter in the previous
function, so this got caught during runtime as crash in test btrfs/027.
Reported-by: Chris Mason <clm@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/scrub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 58a249cd5adc..738e784ba20d 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -714,9 +714,9 @@ struct scrub_ctx *scrub_setup_ctx(struct btrfs_device *dev, int is_dev_replace) mutex_init(&sctx->wr_lock); sctx->wr_curr_bio = NULL; if (is_dev_replace) { - WARN_ON(!dev->bdev); + WARN_ON(!fs_info->dev_replace.tgtdev); sctx->pages_per_wr_bio = SCRUB_PAGES_PER_WR_BIO; - sctx->wr_tgtdev = dev; + sctx->wr_tgtdev = fs_info->dev_replace.tgtdev; atomic_set(&sctx->flush_all_writes, 0); } |