diff options
| author |   Christoph Hellwig <hch@lst.de> | 2022-01-24 10:11:05 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2022-02-02 07:49:59 -0700 |
| commit | 07888c665b405b1cd3577ddebfeb74f4717a84c4 (patch) | |
| tree | fe3700fcd1b741ddd3caa84a184a8aaaf9e098d7 /drivers/nvdimm | |
| parent | block: pass a block_device and opf to bio_alloc_kiocb (diff) | |
| download | linux-dev-07888c665b405b1cd3577ddebfeb74f4717a84c4.tar.xz linux-dev-07888c665b405b1cd3577ddebfeb74f4717a84c4.zip | |
block: pass a block_device and opf to bio_alloc
Pass the block_device and operation that we plan to use this bio for to
bio_alloc to optimize the assignment. NULL/0 can be passed, both for the
passthrough case on a raw request_queue and to temporarily avoid
refactoring some nasty code.
Also move the gfp_mask argument after the nr_vecs argument for a much
more logical calling convention matching what most of the kernel does.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220124091107.642561-18-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvdimm')
| -rw-r--r-- | drivers/nvdimm/nd_virtio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/nvdimm/nd_virtio.c b/drivers/nvdimm/nd_virtio.c index 10351d5b49fa..c6a648fd8744 100644 --- a/drivers/nvdimm/nd_virtio.c +++ b/drivers/nvdimm/nd_virtio.c @@ -105,12 +105,12 @@ int async_pmem_flush(struct nd_region *nd_region, struct bio *bio) * parent bio. Otherwise directly call nd_region flush. */ if (bio && bio->bi_iter.bi_sector != -1) { - struct bio *child = bio_alloc(GFP_ATOMIC, 0); + struct bio *child = bio_alloc(bio->bi_bdev, 0, REQ_PREFLUSH, + GFP_ATOMIC); if (!child) return -ENOMEM; - bio_copy_dev(child, bio); - child->bi_opf = REQ_PREFLUSH; + bio_clone_blkg_association(child, bio); child->bi_iter.bi_sector = -1; bio_chain(child, bio); submit_bio(child); |