From patchwork Fri May 22 18:18:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lin X-Patchwork-Id: 6467121 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 041C4C0020 for ; Fri, 22 May 2015 18:21:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1634B20437 for ; Fri, 22 May 2015 18:21:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E3FA204A7 for ; Fri, 22 May 2015 18:21:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757385AbbEVSUp (ORCPT ); Fri, 22 May 2015 14:20:45 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:10138 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756676AbbEVSTf (ORCPT ); Fri, 22 May 2015 14:19:35 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NOR0082JK8M8A40@mailout3.samsung.com>; Sat, 23 May 2015 03:19:34 +0900 (KST) X-AuditID: cbfee61a-f79516d000006302-4b-555f7335b7f7 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 14.CF.25346.5337F555; Sat, 23 May 2015 03:19:34 +0900 (KST) Received: from localhost.localdomain ([105.128.33.253]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NOR00J2FK7W6U50@mmp1.samsung.com>; Sat, 23 May 2015 03:19:33 +0900 (KST) From: Ming Lin To: linux-kernel@vger.kernel.org Cc: Christoph Hellwig , Kent Overstreet , Jens Axboe , Dongsu Park , Ming Lin , Christoph Hellwig , Al Viro , linux-fsdevel@vger.kernel.org Subject: [PATCH v4 09/11] fs: use helper bio_add_page() instead of open coding on bi_io_vec Date: Fri, 22 May 2015 11:18:41 -0700 Message-id: <1432318723-18829-10-git-send-email-mlin@kernel.org> X-Mailer: git-send-email 1.9.1 In-reply-to: <1432318723-18829-1-git-send-email-mlin@kernel.org> References: <1432318723-18829-1-git-send-email-mlin@kernel.org> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrJLMWRmVeSWpSXmKPExsVy+t9jAV2z4vhQg1PyFqvv9rNZ7JjxlMni 9IRFTBYrVx9lsjjSVGWxZ+9JFovLu+awWZzfdpLV4vzf46wOnB47Z91l99i8Qsvj8tlSj02r Otk8dt9sYPN4fPgku8fnTXIem568ZQrgiOKySUnNySxLLdK3S+DK2DPnLFvBf8mKlY82sDQw PhTtYuTkkBAwkTh+oJMZwhaTuHBvPVsXIxeHkMAiRonTM1ugnJ+MEusXHWYFqWITUJA4uG4D E4gtAmRv7n3GClLELDCLSeLHtztgo4QFYiXmHGhlBLFZBFQlVu26xg5i8wo4SOxof8YCsU5O 4uSxyUDNHBycQPHduzxAwkIC9hLr1s1lnMDIu4CRYRWjaGpBckFxUnquoV5xYm5xaV66XnJ+ 7iZGcAA+k9rBuLLB4hCjAAejEg+vwcG4UCHWxLLiytxDjBIczEoivLp+8aFCvCmJlVWpRfnx RaU5qcWHGKU5WJTEeU/m+4QKCaQnlqRmp6YWpBbBZJk4OKUaGFljp6w2cQ67OUMj+a6jSvjV 3cmdhzh7fY3t3HULZs/mfff9qN+b6WvXLfzxW+elHaPWjZvZLn5tC2Z/m2Pz0PZ5cI/yW7al bi/8YzgOM97fvXjLvz8b98VztS2QUHnh9cX12pvESxtzhY589Lwq/mAmk3K5gHp22bLta7yL u26viWzV/Jir56/EUpyRaKjFXFScCADJbvjGPAIAAA== Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, 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 From: Kent Overstreet Call pre-defined helper bio_add_page() instead of open coding for iterating through bi_io_vec[]. Doing that, it's possible to make some parts in filesystems and mm/page_io.c simpler than before. Acked-by: Dave Kleikamp Cc: Christoph Hellwig Cc: Al Viro Cc: linux-fsdevel@vger.kernel.org Signed-off-by: Kent Overstreet [dpark: add more description in commit message] Signed-off-by: Dongsu Park Signed-off-by: Ming Lin --- fs/buffer.c | 7 ++----- fs/jfs/jfs_logmgr.c | 14 ++++---------- mm/page_io.c | 8 +++----- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index c7a5602..d9f00b6 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -3022,12 +3022,9 @@ int _submit_bh(int rw, struct buffer_head *bh, unsigned long bio_flags) bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9); bio->bi_bdev = bh->b_bdev; - bio->bi_io_vec[0].bv_page = bh->b_page; - bio->bi_io_vec[0].bv_len = bh->b_size; - bio->bi_io_vec[0].bv_offset = bh_offset(bh); - bio->bi_vcnt = 1; - bio->bi_iter.bi_size = bh->b_size; + bio_add_page(bio, bh->b_page, bh->b_size, bh_offset(bh)); + BUG_ON(bio->bi_iter.bi_size != bh->b_size); bio->bi_end_io = end_bio_bh_io_sync; bio->bi_private = bh; diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index bc462dc..46fae06 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c @@ -1999,12 +1999,9 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp) bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9); bio->bi_bdev = log->bdev; - bio->bi_io_vec[0].bv_page = bp->l_page; - bio->bi_io_vec[0].bv_len = LOGPSIZE; - bio->bi_io_vec[0].bv_offset = bp->l_offset; - bio->bi_vcnt = 1; - bio->bi_iter.bi_size = LOGPSIZE; + bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset); + BUG_ON(bio->bi_iter.bi_size != LOGPSIZE); bio->bi_end_io = lbmIODone; bio->bi_private = bp; @@ -2145,12 +2142,9 @@ static void lbmStartIO(struct lbuf * bp) bio = bio_alloc(GFP_NOFS, 1); bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9); bio->bi_bdev = log->bdev; - bio->bi_io_vec[0].bv_page = bp->l_page; - bio->bi_io_vec[0].bv_len = LOGPSIZE; - bio->bi_io_vec[0].bv_offset = bp->l_offset; - bio->bi_vcnt = 1; - bio->bi_iter.bi_size = LOGPSIZE; + bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset); + BUG_ON(bio->bi_iter.bi_size != LOGPSIZE); bio->bi_end_io = lbmIODone; bio->bi_private = bp; diff --git a/mm/page_io.c b/mm/page_io.c index 6424869..9fb8a0d 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -33,12 +33,10 @@ static struct bio *get_swap_bio(gfp_t gfp_flags, if (bio) { bio->bi_iter.bi_sector = map_swap_page(page, &bio->bi_bdev); bio->bi_iter.bi_sector <<= PAGE_SHIFT - 9; - bio->bi_io_vec[0].bv_page = page; - bio->bi_io_vec[0].bv_len = PAGE_SIZE; - bio->bi_io_vec[0].bv_offset = 0; - bio->bi_vcnt = 1; - bio->bi_iter.bi_size = PAGE_SIZE; bio->bi_end_io = end_io; + + bio_add_page(bio, page, PAGE_SIZE, 0); + BUG_ON(bio->bi_iter.bi_size != PAGE_SIZE); } return bio; }