From patchwork Tue Dec 27 16:04:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 9489585 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 6227E62AB0 for ; Tue, 27 Dec 2016 16:12:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54F93201BC for ; Tue, 27 Dec 2016 16:12:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4984825F3E; Tue, 27 Dec 2016 16:12:18 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8D0D201BC for ; Tue, 27 Dec 2016 16:12:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933367AbcL0QMP (ORCPT ); Tue, 27 Dec 2016 11:12:15 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34014 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932969AbcL0QGk (ORCPT ); Tue, 27 Dec 2016 11:06:40 -0500 Received: by mail-pf0-f194.google.com with SMTP id y68so18353840pfb.1; Tue, 27 Dec 2016 08:06:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jPNpDCfI2+vBzRyT+X/wVTiCuqskiNq/TmL4WKd/8pw=; b=sDrVE5qsq1CLKfxZEOJk8bYwJ3HRKgcCH4LBAvtdIsX+lb0GDp5IeWIr2qZ1S3TOoS 9UqQl7/cWIpZgndP5i8hXBjMT64do4v+aP0YpsmlxO7TBQMQEIuF89UoOOXqCxfHSDki LPxv+PcU+Wg820r1ODtU3XiAQUtJkvACtnTFSgRKE01qlKJvg7Ao3CwIoqpkEttDc+LE Rsux3EGj9Dv9hWja+Gkc7HGrz9A9RgQ9nUmoxEBxNM6OrJVk92Y30vUfHx3PIIH77dUb 3Md1e3zZQGhCqaBsOOkgqK82WbriLIAI0myMYiI3GbFHwUcPXTr17b9lEmchU5vYy5aT kTGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jPNpDCfI2+vBzRyT+X/wVTiCuqskiNq/TmL4WKd/8pw=; b=VRPNOM/tSgcY/ETKon0LKxArI2QN52ZNGZsy1KVn1hbzg54dcprwDSVbdqf0KQ/dTE yVbaFkVwD2op1igyvHJYuu1Iln33XKF5+7aaiTt5MY0tqe5ehVUe8R4I+HxPLstU2ajg Y/DxQa3kj6sGxBSUSRo3QvzVOYnaFcJwF5m2j0WrdPC0I6+5gpJoQJuCSEVsPpePnDm8 owA/nvA+6z0hXYMO/9GssPXVrLyxYw0RolTobcJ1PKekWCCrMCyjUv6+Il6UKyEXboqg VySCSE+mPBmoQ7kuS5VL/T3K0jYNiIMn11Vfpi9fyd87LWq5skRe2H0hRXNrvyIfPxRk NBGg== X-Gm-Message-State: AIkVDXI7/Hth0TSjk6Xgj1DrmcBr9dm25plhUt8QlCBPtwJHa+UvVvmQaEzjFjZqVaWoHQ== X-Received: by 10.99.212.69 with SMTP id i5mr60258864pgj.29.1482854794434; Tue, 27 Dec 2016 08:06:34 -0800 (PST) Received: from localhost ([45.35.47.137]) by smtp.gmail.com with ESMTPSA id n8sm70120838pgc.0.2016.12.27.08.06.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Dec 2016 08:06:33 -0800 (PST) From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, Christoph Hellwig , Ming Lei , Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net (open list:F2FS FILE SYSTEM) Subject: [PATCH v1 44/54] f2fs: convert to bio_for_each_segment_all_sp() Date: Wed, 28 Dec 2016 00:04:53 +0800 Message-Id: <1482854706-14128-13-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482854706-14128-1-git-send-email-tom.leiming@gmail.com> References: <1482854706-14128-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-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ming Lei --- fs/f2fs/data.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 5d1a192e1c3c..d48b2057c2ee 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -53,6 +53,7 @@ static void f2fs_read_end_io(struct bio *bio) { struct bio_vec *bvec; int i; + struct bvec_iter_all bia; #ifdef CONFIG_F2FS_FAULT_INJECTION /* @@ -72,7 +73,7 @@ static void f2fs_read_end_io(struct bio *bio) } } - bio_for_each_segment_all(bvec, bio, i) { + bio_for_each_segment_all_sp(bvec, bio, i, bia) { struct page *page = bvec->bv_page; if (!bio->bi_error) { @@ -92,8 +93,9 @@ static void f2fs_write_end_io(struct bio *bio) struct f2fs_sb_info *sbi = bio->bi_private; struct bio_vec *bvec; int i; + struct bvec_iter_all bia; - bio_for_each_segment_all(bvec, bio, i) { + bio_for_each_segment_all_sp(bvec, bio, i, bia) { struct page *page = bvec->bv_page; enum count_type type = WB_DATA_TYPE(page); @@ -206,6 +208,7 @@ static bool __has_merged_page(struct f2fs_bio_info *io, struct inode *inode, struct bio_vec *bvec; struct page *target; int i; + struct bvec_iter_all bia; if (!io->bio) return false; @@ -213,7 +216,7 @@ static bool __has_merged_page(struct f2fs_bio_info *io, struct inode *inode, if (!inode && !page && !ino) return true; - bio_for_each_segment_all(bvec, io->bio, i) { + bio_for_each_segment_all_sp(bvec, io->bio, i, bia) { if (bvec->bv_page->mapping) target = bvec->bv_page;