Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755015AbcDNMDk (ORCPT ); Thu, 14 Apr 2016 08:03:40 -0400 Received: from mail-ob0-f193.google.com ([209.85.214.193]:36747 "EHLO mail-ob0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754888AbcDNMDh (ORCPT ); Thu, 14 Apr 2016 08:03:37 -0400 From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, Christoph Hellwig , Ming Lei , Kent Overstreet , Shaohua Li , linux-bcache@vger.kernel.org (open list:BCACHE (BLOCK LAYER CACHE)), linux-raid@vger.kernel.org (open list:SOFTWARE RAID (Multiple Disks) SUPPORT) Subject: [PATCH v1 16/27] bcache: super: use bio_get_base_vec Date: Thu, 14 Apr 2016 20:02:34 +0800 Message-Id: <1460635375-28282-17-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1460635375-28282-1-git-send-email-tom.leiming@gmail.com> References: <1460635375-28282-1-git-send-email-tom.leiming@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2809 Lines: 83 Signed-off-by: Ming Lei --- drivers/md/bcache/super.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 3fa1ecf..d7fda32 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -208,7 +208,12 @@ static void write_bdev_super_endio(struct bio *bio) static void __write_super(struct cache_sb *sb, struct bio *bio) { - struct cache_sb *out = page_address(bio->bi_io_vec[0].bv_page); + /* + * For accessing page pointed to by the 1st bvec, it + * works too after multipage bvecs. + */ + struct bio_vec *bvec = bio_get_base_vec(bio); + struct cache_sb *out = page_address(bvec->bv_page); unsigned i; bio->bi_iter.bi_sector = SB_SECTOR; @@ -1145,6 +1150,7 @@ static void register_bdev(struct cache_sb *sb, struct page *sb_page, char name[BDEVNAME_SIZE]; const char *err = "cannot allocate memory"; struct cache_set *c; + struct bio_vec *bvec; memcpy(&dc->sb, sb, sizeof(struct cache_sb)); dc->bdev = bdev; @@ -1152,7 +1158,9 @@ static void register_bdev(struct cache_sb *sb, struct page *sb_page, bio_init(&dc->sb_bio); bio_set_vec_table(&dc->sb_bio, dc->sb_bio.bi_inline_vecs, 1); - dc->sb_bio.bi_io_vec[0].bv_page = sb_page; + /* single bvec, still works after multipage bvecs */ + bvec = bio_get_base_vec(&dc->sb_bio); + bvec->bv_page = sb_page; get_page(sb_page); if (cached_dev_init(dc, sb->block_size << 9)) @@ -1776,6 +1784,11 @@ void bch_cache_release(struct kobject *kobj) { struct cache *ca = container_of(kobj, struct cache, kobj); unsigned i; + /* + * For accessing page pointed to by the 1st bvec, it + * works too after multipage bvecs. + */ + struct bio_vec *bvec = bio_get_base_vec(&ca->sb_bio); if (ca->set) { BUG_ON(ca->set->cache[ca->sb.nr_this_dev] != ca); @@ -1793,7 +1806,7 @@ void bch_cache_release(struct kobject *kobj) free_fifo(&ca->free[i]); if (ca->sb_bio.bi_inline_vecs[0].bv_page) - put_page(ca->sb_bio.bi_io_vec[0].bv_page); + put_page(bvec->bv_page); if (!IS_ERR_OR_NULL(ca->bdev)) blkdev_put(ca->bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL); @@ -1843,6 +1856,7 @@ static int register_cache(struct cache_sb *sb, struct page *sb_page, char name[BDEVNAME_SIZE]; const char *err = NULL; int ret = 0; + struct bio_vec *bvec; memcpy(&ca->sb, sb, sizeof(struct cache_sb)); ca->bdev = bdev; @@ -1850,7 +1864,8 @@ static int register_cache(struct cache_sb *sb, struct page *sb_page, bio_init(&ca->sb_bio); bio_set_vec_table(&ca->sb_bio, ca->sb_bio.bi_inline_vecs, 1); - ca->sb_bio.bi_io_vec[0].bv_page = sb_page; + bvec = bio_get_base_vec(&ca->sb_bio); + bvec->bv_page = sb_page; get_page(sb_page); if (blk_queue_discard(bdev_get_queue(ca->bdev))) -- 1.9.1