fs/bio-integrity: remove duplicate code
PATCH 1/1 fs/bio-integrity: remove duplicate code
Most code of function bio_integrity_verify and bio_integrity_generate is the same, so introduce a help function bio_integrity_generate_verify() to remove the duplicate code.
Signed-off-by Gu Zheng <[email protected]>
--- fs/bio-integrity.c | 86 ++++++++++++++++++++++----------------------------- 1 files changed, 37 insertions(+), 49 deletions(-)
fs/bio-integrity.c +37 -49
@@ -301,25 +301,26 @@ int bio_integrity_get_tag(struct bio *bio, void *tag_buf, unsigned int len)EXPORT_SYMBOL (bio_integrity_get_tag);/** -* bio_integrity_generate - Generate integrity metadata for a bio -* @bio: bio to generate integrity metadata for -* -* Description: Generates integrity metadata for a bio by calling the -* block device's generation callback function. The bio must have a -* bip attached with enough room to accommodate the generated -* integrity metadata. +* bio_integrity_generate_verify - Generate/verify integrity metadata for a bio +* @bio: bio to generate/verify integrity metadata for +* @operate: operate number, 1 for generate, 0 for verify */ -static void bio_integrity_generate (struct bio *bio) +static int bio_integrity_generate_verify (struct bio *bio,int operate) {struct blk_integrity *bi =bdev_get_integrity (bio->bi_bdev);struct blk_integrity_exchg bix;struct bio_vec bv;struct bvec_iter iter; -sector_t sector = bio->bi_iter.bi_sector; -unsigned int sectors, total; +sector_t sector; +unsigned int sectors, total, ret;void *prot_buf = bio->bi_integrity->bip_buf; - total =0 ; +if (operate) + sector = bio->bi_iter.bi_sector; +else + sector = bio->bi_integrity->bip_iter.bi_sector; + + total = ret =0 ; bix.disk_name = bio->bi_bdev->bd_disk->disk_name; bix.sector_size = bi->sector_size;
@@ -330,7 +331,15 @@ static void bio_integrity_generate(struct bio *bio) bix.prot_buf = prot_buf; bix.sector = sector; - bi->generate_fn (&bix); +if (operate) { + bi->generate_fn (&bix); + }else { + ret = bi->verify_fn (&bix); +if (ret) { +kunmap_atomic (kaddr); +return ret; + } + } sectors = bv.bv_len / bi->sector_size; sector += sectors;
@@ -340,6 +349,21 @@ static void bio_integrity_generate(struct bio *bio)kunmap_atomic (kaddr); } +return ret; +} + +/** +* bio_integrity_generate - Generate integrity metadata for a bio +* @bio: bio to generate integrity metadata for +* +* Description: Generates integrity metadata for a bio by calling the +* block device's generation callback function. The bio must have a +* bip attached with enough room to accommodate the generated +* integrity metadata. +*/ +static void bio_integrity_generate (struct bio *bio) +{ +bio_integrity_generate_verify (bio,1 ); }static inline unsigned short blk_integrity_tuple_size (struct blk_integrity *bi)
@@ -454,43 +478,7 @@ EXPORT_SYMBOL(bio_integrity_prep);*/ static int bio_integrity_verify (struct bio *bio) { -struct blk_integrity *bi =bdev_get_integrity (bio->bi_bdev); -struct blk_integrity_exchg bix; -struct bio_vec *bv; -sector_t sector = bio->bi_integrity->bip_iter.bi_sector; -unsigned int sectors, total, ret; -void *prot_buf = bio->bi_integrity->bip_buf; -int i; - - ret = total =0 ; - bix.disk_name = bio->bi_bdev->bd_disk->disk_name; - bix.sector_size = bi->sector_size; - -bio_for_each_segment_all (bv, bio, i) { -void *kaddr =kmap_atomic (bv->bv_page); - - bix.data_buf = kaddr + bv->bv_offset; - bix.data_size = bv->bv_len; - bix.prot_buf = prot_buf; - bix.sector = sector; - - ret = bi->verify_fn (&bix); - -if (ret) { -kunmap_atomic (kaddr); -return ret; - } - - sectors = bv->bv_len / bi->sector_size; - sector += sectors; - prot_buf += sectors * bi->tuple_size; - total += sectors * bi->tuple_size; -BUG_ON (total > bio->bi_integrity->bip_iter.bi_size); - -kunmap_atomic (kaddr); - } - -return ret; +return bio_integrity_generate_verify (bio,0 ); }/**
Signature · 1 line
1.7.7
Quoted 3 lines · Gu Zheng
Most code of function
bio_integrity_verifyandbio_integrity_generateis the same, so introduce a help functionbio_integrity_generate_verify()to remove the duplicate code.
Thanks, queued up for the next release.
Signature · 1 line
Jens Axboe