From patchwork Thu Apr 14 12:02:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 8834881 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 604F39F3A0 for ; Thu, 14 Apr 2016 12:03:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 666D720131 for ; Thu, 14 Apr 2016 12:03:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73F732014A for ; Thu, 14 Apr 2016 12:03:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754983AbcDNMDj (ORCPT ); Thu, 14 Apr 2016 08:03:39 -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 Received: by mail-ob0-f193.google.com with SMTP id rf6so4871725obc.3; Thu, 14 Apr 2016 05:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aTX2XohhHOxWFAc2P5GRis76o0Kw68HMQri9TjHs5w0=; b=i7wKpTYcqTsI2tdMxxXKXN95KxYe9XxFLe68VIwyh8pWJI5Y6+y005uVJN/glxrxEO shjICPXTcVsdrxdlcboZK+c0cL02FjkJl46Ewy68K3UiY5c5q5Yj+GWdUPeNsuNedioN KJUK5dLTe20S09SF8ZANs6Lpf3f4MjxoIcMDaAhD5t4rX9mrIk01q39f6DByue6UfSq2 2GoCqit4M053k7QKQGmiKKyH+5WlvfMPcmmydt9cNTfqLBCypNnuOvqci0TUA7R56bei dPYX9IByQNELpieP6NhzTTu3XgjV3AfnThqoldCBl7mzTjK2tNe3ijz1KvAkB1GwiJmU eR+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aTX2XohhHOxWFAc2P5GRis76o0Kw68HMQri9TjHs5w0=; b=jyQCVXUjRDJLXoqRL6qqhsqUbhYMf0XAy9qL02D5fxVgfmr+4VW26/HwTrxn/5JQSm Biwu/P39U7FC5XnIFXVIFNZlUxDWPlAe7jBRaK1AE+7ntVmof6QjZ5H9TaxdOMqit+Ia HYZdzpv1y8jrgiuZFfksowRRecflrfVcOv0mfCyOckbaOeARNqitOIUtqCCV3BvhvyVv KLVSU6gf/pvqQAT4SaObbpcXvlHKn1daTqEkNQwMT8JoYh1bo8wm93YSSJPoN35jPHU1 O9uqBHOY+ZrMkE0Mb37HHbJpUNOpBzfPUXuYd2gRawfXkSFK+wXpZv+UNVkOKx55CUaS MUIg== X-Gm-Message-State: AOPr4FVxYpR146xmvpPduKx33Y3uRwJkvu9QGTNM/X1fo4CCviohzE7cUat4VVkDTCCaRQ== X-Received: by 10.182.98.167 with SMTP id ej7mr7784748obb.46.1460635416212; Thu, 14 Apr 2016 05:03:36 -0700 (PDT) Received: from localhost ([12.228.154.70]) by smtp.gmail.com with ESMTPSA id dn8sm6155488oeb.15.2016.04.14.05.03.35 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 14 Apr 2016 05:03:35 -0700 (PDT) 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-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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)))