From patchwork Fri May 25 03:45:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10426019 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 55F29602D8 for ; Fri, 25 May 2018 03:47:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4650F2959E for ; Fri, 25 May 2018 03:47:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 38C07295A4; Fri, 25 May 2018 03:47:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9EEF92959E for ; Fri, 25 May 2018 03:47:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8CB936B0290; Thu, 24 May 2018 23:47:30 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 87B5D6B0292; Thu, 24 May 2018 23:47:30 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 791D06B0293; Thu, 24 May 2018 23:47:30 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f200.google.com (mail-qt0-f200.google.com [209.85.216.200]) by kanga.kvack.org (Postfix) with ESMTP id 4ED1C6B0290 for ; Thu, 24 May 2018 23:47:30 -0400 (EDT) Received: by mail-qt0-f200.google.com with SMTP id g12-v6so2785130qtj.22 for ; Thu, 24 May 2018 20:47:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=Gj6S7RreSjPf2zmTr/FvjI23L2axfTCwajoxs2ptVb8=; b=r512+ui90O9D3+cixsWiqjpZVNG3aHljgeDsnlKHUsigvctwgq9R31+YTDgwWZbj5h pkljvg69eXhD1HoKRsZKwzcdOekR4pn8AlSprLA2/F6rmuXKeI38mNCjKwsOyfWf7CAn NtcMTmNPPT7Pc/lXAiSgO35Y667I8sIU3iljc/Id0tc/hMOtuFvcujYKr+UNZKb8Qtgl U1yZtXkM/eA/GmBDzNSu/vX0tr/YeArLPYTzcVXHiNw2rs6U6CDhRa0bZz8jkV8zWH/0 h4LSmLMcrVrw+b41DJq/Yv30EFTNxrbjeuRv3CcsX3LrvDBMiuqFSwbuzhIsLhHIQET8 RcDg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: ALKqPwf+EI2jiSP41ama2uddxW1qDRaCel4DFmyAcnpQElTU0l3BL5sb CB/1+uGKq1jehxW3qgA3GFFqxqMQL36IZyQhXA/1dG859jpqv4OJVQXxtUpDMxLsaJcYBiC6gLA ZUaXLfRuiDGr5vrjwW2YW+nJYOodtcRcqfYHX9dW3zcVgSwVQ/VlwmgxjcORNo86vPw== X-Received: by 2002:a0c:b3c7:: with SMTP id b7-v6mr625727qvf.86.1527220050112; Thu, 24 May 2018 20:47:30 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKB/CXHMKdkBBwehL0L/+tA+oSM0A4lfpjMqpuH/Ak009xAEIPsNrPXGWsJTJP55kDuBsz7 X-Received: by 2002:a0c:b3c7:: with SMTP id b7-v6mr625709qvf.86.1527220049453; Thu, 24 May 2018 20:47:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527220049; cv=none; d=google.com; s=arc-20160816; b=spIsI0335mXGYGlYRUkqkQoO1yWcTWSR/ufkFDwbXwxnt/JsL4E3wox+ZBI380z+j6 Ch+zv1itRswCWSQjLh8yYv3Yp/GTXYRDAM57j1ZgKwb1mJ0i4qXJHs0yPIrz3UN0rl0j 6kUae/Y2h1i1jyWaQw0zws9poOImgq9fnobvUDDaGmMlMBZSfNqbT0QrWqnuda+GUyb/ DzFLmtgxu1rghJK4sNAAoP9jxstAECZ9td+ZQw75xhk/o+Evemrk4ABZgfrRxaWFEQYF 22ufZMZWeaLSKPvCgIZCLzxYqs5FYe7wLU7NU0HaqaTPayZdBOtrcCeBDIGfSWpKl27H pUog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Gj6S7RreSjPf2zmTr/FvjI23L2axfTCwajoxs2ptVb8=; b=KWxjDtjrvPwe1QdijNxocZY2StDwKkFI2WrCgKQbeUGYXsZYICdDgRGdEelA7dJ6xh 6N06KCNY7PPlESgwcTsNXuFcMoFNrxdGCCMDxHwcAN87e2dw3ttBCxUc8ikYFRFWZupI w3BGQIh/tSltOWKsnhpPPJE2J9TvVRSf+/e8APgGx0gXOCJGTXkwwAXxDBgX8oSMunT/ QCL1SjjBEIcMQxkBh8YBWg+nDdtzmlETdcprthGkZNApCmhDGyM+c8VIv+woCXJ002p2 WYeAZqvsNtLNyc4Ve94cz55F2CwFe9zx9YmDs+GnNnPXWEvorMoxjVf7vz0v95R/QmBQ oOtw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx3-rdu2.redhat.com. [66.187.233.73]) by mx.google.com with ESMTPS id s57-v6si764659qvs.140.2018.05.24.20.47.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 May 2018 20:47:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ming.lei@redhat.com designates 66.187.233.73 as permitted sender) client-ip=66.187.233.73; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0CF44401EF03; Fri, 25 May 2018 03:47:29 +0000 (UTC) Received: from localhost (ovpn-12-30.pek2.redhat.com [10.72.12.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C15710EE6C1; Fri, 25 May 2018 03:47:17 +0000 (UTC) From: Ming Lei To: Jens Axboe , Christoph Hellwig , Alexander Viro , Kent Overstreet Cc: David Sterba , Huang Ying , linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Theodore Ts'o , "Darrick J . Wong" , Coly Li , Filipe Manana , Ming Lei Subject: [RESEND PATCH V5 03/33] block: rename bio_segments() with bio_pages() Date: Fri, 25 May 2018 11:45:51 +0800 Message-Id: <20180525034621.31147-4-ming.lei@redhat.com> In-Reply-To: <20180525034621.31147-1-ming.lei@redhat.com> References: <20180525034621.31147-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 25 May 2018 03:47:29 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 25 May 2018 03:47:29 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'ming.lei@redhat.com' RCPT:'' X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP bio_segments() never returns count of actual segment, just like original bio_for_each_segment(), so rename it as bio_pages(). Signed-off-by: Ming Lei --- block/bio.c | 2 +- block/blk-merge.c | 2 +- drivers/block/loop.c | 4 ++-- drivers/md/dm-log-writes.c | 2 +- drivers/target/target_core_pscsi.c | 2 +- fs/btrfs/check-integrity.c | 2 +- fs/btrfs/inode.c | 2 +- include/linux/bio.h | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/block/bio.c b/block/bio.c index 5495dc30d080..d0debb22ee34 100644 --- a/block/bio.c +++ b/block/bio.c @@ -682,7 +682,7 @@ struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask, * __bio_clone_fast() anyways. */ - bio = bio_alloc_bioset(gfp_mask, bio_segments(bio_src), bs); + bio = bio_alloc_bioset(gfp_mask, bio_pages(bio_src), bs); if (!bio) return NULL; bio->bi_disk = bio_src->bi_disk; diff --git a/block/blk-merge.c b/block/blk-merge.c index fc2aa21b7959..545609fc4905 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -302,7 +302,7 @@ void blk_recount_segments(struct request_queue *q, struct bio *bio) /* estimate segment number by bi_vcnt for non-cloned bio */ if (bio_flagged(bio, BIO_CLONED)) - seg_cnt = bio_segments(bio); + seg_cnt = bio_pages(bio); else seg_cnt = bio->bi_vcnt; diff --git a/drivers/block/loop.c b/drivers/block/loop.c index d04ba3f0c5de..8d7d5581ca9c 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -521,7 +521,7 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, struct bio_vec tmp; __rq_for_each_bio(bio, rq) - segments += bio_segments(bio); + segments += bio_pages(bio); bvec = kmalloc(sizeof(struct bio_vec) * segments, GFP_NOIO); if (!bvec) return -EIO; @@ -547,7 +547,7 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, */ offset = bio->bi_iter.bi_bvec_done; bvec = __bvec_iter_bvec(bio->bi_io_vec, bio->bi_iter); - segments = bio_segments(bio); + segments = bio_pages(bio); } atomic_set(&cmd->ref, 2); diff --git a/drivers/md/dm-log-writes.c b/drivers/md/dm-log-writes.c index ab31ba9c3b37..e5d455245ed9 100644 --- a/drivers/md/dm-log-writes.c +++ b/drivers/md/dm-log-writes.c @@ -680,7 +680,7 @@ static int log_writes_map(struct dm_target *ti, struct bio *bio) if (discard_bio) alloc_size = sizeof(struct pending_block); else - alloc_size = sizeof(struct pending_block) + sizeof(struct bio_vec) * bio_segments(bio); + alloc_size = sizeof(struct pending_block) + sizeof(struct bio_vec) * bio_pages(bio); block = kzalloc(alloc_size, GFP_NOIO); if (!block) { diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index 668934ea74cb..01116cf9d634 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c @@ -915,7 +915,7 @@ pscsi_map_sg(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, rc = bio_add_pc_page(pdv->pdv_sd->request_queue, bio, page, bytes, off); pr_debug("PSCSI: bio->bi_vcnt: %d nr_vecs: %d\n", - bio_segments(bio), nr_vecs); + bio_pages(bio), nr_vecs); if (rc != bytes) { pr_debug("PSCSI: Reached bio->bi_vcnt max:" " %d i: %d bio: %p, allocating another" diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index e5f7df09683f..55c4db22cfb9 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -2800,7 +2800,7 @@ static void __btrfsic_submit_bio(struct bio *bio) struct bvec_iter iter; int bio_is_patched; char **mapped_datav; - unsigned int segs = bio_segments(bio); + unsigned int segs = bio_pages(bio); dev_bytenr = 512 * bio->bi_iter.bi_sector; bio_is_patched = 0; diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index f78155e3a4dc..9d816dc725c4 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7844,7 +7844,7 @@ static blk_status_t dio_read_error(struct inode *inode, struct bio *failed_bio, return BLK_STS_IOERR; } - segs = bio_segments(failed_bio); + segs = bio_pages(failed_bio); bio_get_first_bvec(failed_bio, &bvec); if (segs > 1 || (bvec.bv_len > btrfs_inode_sectorsize(inode))) diff --git a/include/linux/bio.h b/include/linux/bio.h index 63b988043eff..7f92af1299ad 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -199,7 +199,7 @@ static inline bool bio_rewind_iter(struct bio *bio, struct bvec_iter *iter, #define bio_iter_last(bvec, iter) ((iter).bi_size == (bvec).bv_len) -static inline unsigned bio_segments(struct bio *bio) +static inline unsigned bio_pages(struct bio *bio) { unsigned segs = 0; struct bio_vec bv;