Merge tag 'Smack-for-v5.12' of git://github.com/cschaufler/smack-next

[mirror_ubuntu-jammy-kernel.git] / block / bio-integrity.c

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 19617fa326c35f42527a5cb55c4e42f714820d60..dfa652122a2dc89f58a647696d711abdb1a343df 100644 (file)
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -28,7 +28,7 @@ static void __bio_integrity_free(struct bio_set *bs,
        if (bs && mempool_initialized(&bs->bio_integrity_pool)) {
                if (bip->bip_vec)
                        bvec_free(&bs->bvec_integrity_pool, bip->bip_vec,
-                                 bip->bip_slab);
+                                 bip->bip_max_vcnt);
                mempool_free(bip, &bs->bio_integrity_pool);
        } else {
                kfree(bip);
@@ -70,14 +70,11 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio,
        memset(bip, 0, sizeof(*bip));
 
        if (nr_vecs > inline_vecs) {
-               unsigned long idx = 0;
-
-               bip->bip_vec = bvec_alloc(gfp_mask, nr_vecs, &idx,
-                                         &bs->bvec_integrity_pool);
+               bip->bip_max_vcnt = nr_vecs;
+               bip->bip_vec = bvec_alloc(&bs->bvec_integrity_pool,
+                                         &bip->bip_max_vcnt, gfp_mask);
                if (!bip->bip_vec)
                        goto err;
-               bip->bip_max_vcnt = bvec_nr_vecs(idx);
-               bip->bip_slab = idx;
        } else {
                bip->bip_vec = bip->bip_inline_vecs;
                bip->bip_max_vcnt = inline_vecs;