summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Gupta <anuj20.g@samsung.com>2024-07-02 15:37:53 +0530
committerJens Axboe <axboe@kernel.dk>2024-07-04 02:07:58 -0600
commitba942238056584efd3adc278a76592258d500918 (patch)
tree05afe0584e51a7546919d8bbc8a19f0a7cd5b537
parenta18df07b7d3dbfa7ae54962cc59569002eaafd6d (diff)
downloadlinux-stable-ba942238056584efd3adc278a76592258d500918.tar.gz
linux-stable-ba942238056584efd3adc278a76592258d500918.tar.bz2
linux-stable-ba942238056584efd3adc278a76592258d500918.zip
block: reuse original bio_vec array for integrity during clone
Modify bio_integrity_clone to reuse the original bvec array instead of allocating and copying it, similar to how bio data path is cloned. Suggested-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Anuj Gupta <anuj20.g@samsung.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Link: https://lore.kernel.org/r/20240702100753.2168-1-anuj20.g@samsung.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--block/bio-integrity.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index eb3d7bbe1fe8..0dc22985fed6 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -76,7 +76,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio,
&bip->bip_max_vcnt, gfp_mask);
if (!bip->bip_vec)
goto err;
- } else {
+ } else if (nr_vecs) {
bip->bip_vec = bip->bip_inline_vecs;
}
@@ -562,14 +562,11 @@ int bio_integrity_clone(struct bio *bio, struct bio *bio_src,
BUG_ON(bip_src == NULL);
- bip = bio_integrity_alloc(bio, gfp_mask, bip_src->bip_vcnt);
+ bip = bio_integrity_alloc(bio, gfp_mask, 0);
if (IS_ERR(bip))
return PTR_ERR(bip);
- memcpy(bip->bip_vec, bip_src->bip_vec,
- bip_src->bip_vcnt * sizeof(struct bio_vec));
-
- bip->bip_vcnt = bip_src->bip_vcnt;
+ bip->bip_vec = bip_src->bip_vec;
bip->bip_iter = bip_src->bip_iter;
bip->bip_flags = bip_src->bip_flags & ~BIP_BLOCK_INTEGRITY;