Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966448AbcJ2IQL (ORCPT ); Sat, 29 Oct 2016 04:16:11 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36057 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966390AbcJ2IQD (ORCPT ); Sat, 29 Oct 2016 04:16:03 -0400 From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, Christoph Hellwig , "Kirill A . Shutemov" , Ming Lei , Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net (open list:F2FS FILE SYSTEM) Subject: [PATCH 54/60] f2fs: convert to bio_for_each_segment_all_rd() Date: Sat, 29 Oct 2016 16:08:53 +0800 Message-Id: <1477728600-12938-55-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477728600-12938-1-git-send-email-tom.leiming@gmail.com> References: <1477728600-12938-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: 1550 Lines: 56 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 24f6f6977d37..04b1a5caf2d6 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -33,6 +33,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 /* @@ -52,7 +53,7 @@ static void f2fs_read_end_io(struct bio *bio) } } - bio_for_each_segment_all(bvec, bio, i) { + bio_for_each_segment_all_rd(bvec, bio, i, bia) { struct page *page = bvec->bv_page; if (!bio->bi_error) { @@ -72,8 +73,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_rd(bvec, bio, i, bia) { struct page *page = bvec->bv_page; fscrypt_pullback_bio_page(&page, true); @@ -145,6 +147,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; @@ -152,7 +155,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_rd(bvec, io->bio, i, bia) { if (bvec->bv_page->mapping) target = bvec->bv_page; -- 2.7.4