block: release bip in a right way in error path (0b8eb629) · Commits · 戴 / test

block/bio-integrity.c

+14 −9

Original line number	Diff line number	Diff line
		@@ -24,6 +24,18 @@ void blk_flush_integrity(void)
		flush_workqueue(kintegrityd_wq);
		}

		void __bio_integrity_free(struct bio_set bs, struct bio_integrity_payload bip)
		{
		if (bs && mempool_initialized(&bs->bio_integrity_pool)) {
		if (bip->bip_vec)
		bvec_free(&bs->bvec_integrity_pool, bip->bip_vec,
		bip->bip_slab);
		mempool_free(bip, &bs->bio_integrity_pool);
		} else {
		kfree(bip);
		}
		}

		/**
		* bio_integrity_alloc - Allocate integrity payload and attach it to bio
		* @bio: bio to attach integrity metadata to
		@@ -78,7 +90,7 @@ struct bio_integrity_payload bio_integrity_alloc(struct bio bio,

		return bip;
		err:
		mempool_free(bip, &bs->bio_integrity_pool);
		__bio_integrity_free(bs, bip);
		return ERR_PTR(-ENOMEM);
		}
		EXPORT_SYMBOL(bio_integrity_alloc);
		@@ -99,14 +111,7 @@ void bio_integrity_free(struct bio *bio)
		kfree(page_address(bip->bip_vec->bv_page) +
		bip->bip_vec->bv_offset);

		if (bs && mempool_initialized(&bs->bio_integrity_pool)) {
		bvec_free(&bs->bvec_integrity_pool, bip->bip_vec, bip->bip_slab);

		mempool_free(bip, &bs->bio_integrity_pool);
		} else {
		kfree(bip);
		}

		__bio_integrity_free(bs, bip);
		bio->bi_integrity = NULL;
		bio->bi_opf &= ~REQ_INTEGRITY;
		}