]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
bcache: don't clone bio in bch_data_verify
authorChristoph Hellwig <hch@lst.de>
Tue, 24 Jul 2018 07:52:30 +0000 (09:52 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 24 Jul 2018 20:43:19 +0000 (14:43 -0600)
We immediately overwrite the biovec array, so instead just allocate
a new bio and copy over the disk, setor and size.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Acked-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/md/bcache/debug.c

index d030ce3025a6a6f365cb55c740e436ba43fd52bf..04d1467119500e2eb8c4699cdb1a597c06b330b6 100644 (file)
@@ -110,11 +110,15 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)
        struct bio_vec bv, cbv;
        struct bvec_iter iter, citer = { 0 };
 
-       check = bio_clone_kmalloc(bio, GFP_NOIO);
+       check = bio_kmalloc(GFP_NOIO, bio_segments(bio));
        if (!check)
                return;
+       check->bi_disk = bio->bi_disk;
        check->bi_opf = REQ_OP_READ;
+       check->bi_iter.bi_sector = bio->bi_iter.bi_sector;
+       check->bi_iter.bi_size = bio->bi_iter.bi_size;
 
+       bch_bio_map(check, NULL);
        if (bch_bio_alloc_pages(check, GFP_NOIO))
                goto out_put;