]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
btrfs: scrub: fix target device intialization while setting up scrub context
authorDavid Sterba <dsterba@suse.com>
Mon, 26 Jun 2017 13:19:00 +0000 (15:19 +0200)
committerDavid Sterba <dsterba@suse.com>
Thu, 29 Jun 2017 18:17:02 +0000 (20:17 +0200)
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>
fs/btrfs/scrub.c

index 58a249cd5adcf86e489f873c0e959037ab39c1a0..738e784ba20d110af2309ce15b9a974f81c9d386 100644 (file)
@@ -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);
        }