From: Christoph Hellwig Date: Sun, 6 Jun 2021 12:13:53 +0000 (+0200) Subject: block: rename BIP_BLOCK_INTEGRITY to BIP_AUTOFREE_PAYLOAD X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6e2912cdca6153e14dec9c1981c08d959e8feaf9;p=users%2Fhch%2Fblock.git block: rename BIP_BLOCK_INTEGRITY to BIP_AUTOFREE_PAYLOAD Rename the flag to better describe the semantics. Signed-off-by: Christoph Hellwig --- diff --git a/block/bio-integrity.c b/block/bio-integrity.c index 196156ed95a1..0427946a6423 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c @@ -103,7 +103,7 @@ void bio_integrity_free(struct bio *bio) struct bio_integrity_payload *bip = bio_integrity(bio); struct bio_set *bs = bio->bi_pool; - if (bip->bip_flags & BIP_BLOCK_INTEGRITY) + if (bip->bip_flags & BIP_AUTOFREE_PAYLOAD) kfree(page_address(bip->bip_vec->bv_page) + bip->bip_vec->bv_offset); @@ -255,7 +255,7 @@ bool bio_integrity_prep(struct bio *bio) goto err_end_io; } - bip->bip_flags |= BIP_BLOCK_INTEGRITY; + bip->bip_flags |= BIP_AUTOFREE_PAYLOAD; bip->bip_iter.bi_size = len; bip_set_seed(bip, bio->bi_iter.bi_sector); diff --git a/include/linux/bio.h b/include/linux/bio.h index 3fcd06e910f4..09395e55182f 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -318,7 +318,7 @@ static inline struct bio_vec *bio_last_bvec_all(struct bio *bio) } enum bip_flags { - BIP_BLOCK_INTEGRITY = 1 << 0, /* block layer owns integrity data */ + BIP_AUTOFREE_PAYLOAD = 1 << 0, /* block layer owns integrity data */ BIP_MAPPED_INTEGRITY = 1 << 1, /* ref tag has been remapped */ };