Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753392Ab3IXDqv (ORCPT ); Mon, 23 Sep 2013 23:46:51 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:26862 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752529Ab3IXDqt (ORCPT ); Mon, 23 Sep 2013 23:46:49 -0400 X-IronPort-AV: E=Sophos;i="4.90,968,1371052800"; d="scan'208";a="8602453" Message-ID: <524109F3.3040300@cn.fujitsu.com> Date: Tue, 24 Sep 2013 11:41:39 +0800 From: Gu Zheng User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0.1) Gecko/20110930 Thunderbird/7.0.1 MIME-Version: 1.0 To: Al Viro CC: Jens , fsdevel , linux-kernel , Andrew Morton Subject: [PATCH V2] fs/bio-integrity: remove duplicate code References: <523C030E.3040408@cn.fujitsu.com> In-Reply-To: <523C030E.3040408@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/24 11:44:57, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/24 11:45:01, Serialize complete at 2013/09/24 11:45:01 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4280 Lines: 146 Most code of function bio_integrity_verify and bio_integrity_generate is the same, so introduce a common function bio_integrity_generate_verify() to remove the reduplicate code. v2: fix a minor logic mistake. Signed-off-by: Gu Zheng --- fs/bio-integrity.c | 86 +++++++++++++++++++++++----------------------------- 1 files changed, 38 insertions(+), 48 deletions(-) diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c index 6025084..4773ab2 100644 --- a/fs/bio-integrity.c +++ b/fs/bio-integrity.c @@ -287,24 +287,25 @@ 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; - sector_t sector = bio->bi_sector; - unsigned int i, sectors, total; + sector_t sector; + unsigned int i, sectors, total, ret; void *prot_buf = bio->bi_integrity->bip_buf; - total = 0; + if (operate) + sector = bio->bi_sector; + else + sector = bio->bi_integrity->bip_sector; + + ret = total = 0; bix.disk_name = bio->bi_bdev->bd_disk->disk_name; bix.sector_size = bi->sector_size; @@ -314,8 +315,15 @@ static void bio_integrity_generate(struct bio *bio) bix.data_size = bv->bv_len; 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; @@ -325,6 +333,22 @@ 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) @@ -439,41 +463,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_sector; - unsigned int i, sectors, total, ret; - void *prot_buf = bio->bi_integrity->bip_buf; - - ret = total = 0; - bix.disk_name = bio->bi_bdev->bd_disk->disk_name; - bix.sector_size = bi->sector_size; - - bio_for_each_segment(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_size); - - kunmap_atomic(kaddr); - } - - return ret; + return bio_integrity_generate_verify(bio, 0); } /** -- 1.7.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/