From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755207AbaLVPWs (ORCPT ); Mon, 22 Dec 2014 10:22:48 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:29516 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755181AbaLVPWr (ORCPT ); Mon, 22 Dec 2014 10:22:47 -0500 Message-ID: <54983731.4080101@oracle.com> Date: Mon, 22 Dec 2014 09:22:25 -0600 From: Dave Kleikamp User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Dongsu Park , linux-kernel@vger.kernel.org CC: Jens Axboe , Kent Overstreet , Ming Lin , Al Viro , linux-fsdevel@vger.kernel.org Subject: Re: [RFC PATCH 15/17] fs: use helper bio_add_page() instead of open coding on bi_io_vec References: <83a9ee8a309f8e08490c5dd715a608ea054f5c33.1419241597.git.dongsu.park@profitbricks.com> <0b6ba533a64aec98e8447bfd30c6622d0729d12e.1419241597.git.dongsu.park@profitbricks.com> <4334b90a56b96ad7a11e4ba7eb97c2cf4405950d.1419241597.git.dongsu.park@profitbricks.com> In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/22/2014 05:48 AM, Dongsu Park wrote: > 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. > > Signed-off-by: Kent Overstreet > [dpark: add more description in commit message] > Signed-off-by: Dongsu Park > Cc: Al Viro > Cc: Dave Kleikamp Acked-by: Dave Kleikamp > Cc: linux-fsdevel@vger.kernel.org > --- > 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 20805db..35ac0ec 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 955db8b..8c878c7 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; > } > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Kleikamp Subject: Re: [RFC PATCH 15/17] fs: use helper bio_add_page() instead of open coding on bi_io_vec Date: Mon, 22 Dec 2014 09:22:25 -0600 Message-ID: <54983731.4080101@oracle.com> References: <83a9ee8a309f8e08490c5dd715a608ea054f5c33.1419241597.git.dongsu.park@profitbricks.com> <0b6ba533a64aec98e8447bfd30c6622d0729d12e.1419241597.git.dongsu.park@profitbricks.com> <4334b90a56b96ad7a11e4ba7eb97c2cf4405950d.1419241597.git.dongsu.park@profitbricks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: Jens Axboe , Kent Overstreet , Ming Lin , Al Viro , linux-fsdevel@vger.kernel.org To: Dongsu Park , linux-kernel@vger.kernel.org Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org On 12/22/2014 05:48 AM, Dongsu Park wrote: > 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. > > Signed-off-by: Kent Overstreet > [dpark: add more description in commit message] > Signed-off-by: Dongsu Park > Cc: Al Viro > Cc: Dave Kleikamp Acked-by: Dave Kleikamp > Cc: linux-fsdevel@vger.kernel.org > --- > 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 20805db..35ac0ec 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 955db8b..8c878c7 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; > } >