Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753111AbcDRPMu (ORCPT ); Mon, 18 Apr 2016 11:12:50 -0400 Received: from mx2.suse.de ([195.135.220.15]:39189 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752680AbcDRPMr (ORCPT ); Mon, 18 Apr 2016 11:12:47 -0400 Date: Mon, 18 Apr 2016 17:12:42 +0200 From: Jan Kara To: Jens Axboe Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, jack@suse.cz, dchinner@redhat.com Subject: Re: [PATCH 2/8] writeback: add wbc_to_write_cmd() Message-ID: <20160418151242.GA28721@quack2.suse.cz> References: <1460953487-3430-1-git-send-email-axboe@fb.com> <1460953487-3430-3-git-send-email-axboe@fb.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1460953487-3430-3-git-send-email-axboe@fb.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5956 Lines: 176 On Sun 17-04-16 23:24:41, Jens Axboe wrote: > Add wbc_to_write_cmd(), which returns the write type to use, based on a > struct writeback_control. No functional changes in this patch, but it > prepares us for factoring other wbc fields for write type. > > Signed-off-by: Jens Axboe Looks good. You can add: Reviewed-by: Jan Kara Honza > --- > fs/block_dev.c | 2 +- > fs/buffer.c | 2 +- > fs/f2fs/data.c | 2 +- > fs/f2fs/node.c | 2 +- > fs/gfs2/meta_io.c | 3 +-- > fs/mpage.c | 9 ++++----- > fs/xfs/xfs_aops.c | 2 +- > include/linux/writeback.h | 8 ++++++++ > 8 files changed, 18 insertions(+), 12 deletions(-) > > diff --git a/fs/block_dev.c b/fs/block_dev.c > index 20a2c02b77c4..8662da6aa07c 100644 > --- a/fs/block_dev.c > +++ b/fs/block_dev.c > @@ -432,7 +432,7 @@ int bdev_write_page(struct block_device *bdev, sector_t sector, > struct page *page, struct writeback_control *wbc) > { > int result; > - int rw = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC : WRITE; > + int rw = wbc_to_write_cmd(wbc); > const struct block_device_operations *ops = bdev->bd_disk->fops; > > if (!ops->rw_page || bdev_get_integrity(bdev)) > diff --git a/fs/buffer.c b/fs/buffer.c > index af0d9a82a8ed..46763c58e786 100644 > --- a/fs/buffer.c > +++ b/fs/buffer.c > @@ -1697,7 +1697,7 @@ static int __block_write_full_page(struct inode *inode, struct page *page, > struct buffer_head *bh, *head; > unsigned int blocksize, bbits; > int nr_underway = 0; > - int write_op = (wbc->sync_mode == WB_SYNC_ALL ? WRITE_SYNC : WRITE); > + int write_op = wbc_to_write_cmd(wbc); > > head = create_page_buffers(page, inode, > (1 << BH_Dirty)|(1 << BH_Uptodate)); > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > index 5dafb9cef12e..e4e81ce663c5 100644 > --- a/fs/f2fs/data.c > +++ b/fs/f2fs/data.c > @@ -1153,7 +1153,7 @@ static int f2fs_write_data_page(struct page *page, > struct f2fs_io_info fio = { > .sbi = sbi, > .type = DATA, > - .rw = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC : WRITE, > + .rw = wbc_to_write_cmd(wbc), > .page = page, > .encrypted_page = NULL, > }; > diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c > index 1a33de9d84b1..3b377258dc09 100644 > --- a/fs/f2fs/node.c > +++ b/fs/f2fs/node.c > @@ -1397,7 +1397,7 @@ static int f2fs_write_node_page(struct page *page, > struct f2fs_io_info fio = { > .sbi = sbi, > .type = NODE, > - .rw = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC : WRITE, > + .rw = wbc_to_write_cmd(wbc), > .page = page, > .encrypted_page = NULL, > }; > diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c > index 0448524c11bc..3fdfa3848f18 100644 > --- a/fs/gfs2/meta_io.c > +++ b/fs/gfs2/meta_io.c > @@ -37,8 +37,7 @@ static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wb > { > struct buffer_head *bh, *head; > int nr_underway = 0; > - int write_op = REQ_META | REQ_PRIO | > - (wbc->sync_mode == WB_SYNC_ALL ? WRITE_SYNC : WRITE); > + int write_op = REQ_META | REQ_PRIO | wbc_to_write_cmd(wbc); > > BUG_ON(!PageLocked(page)); > BUG_ON(!page_has_buffers(page)); > diff --git a/fs/mpage.c b/fs/mpage.c > index eedc644b78d7..bcbdb61b24f1 100644 > --- a/fs/mpage.c > +++ b/fs/mpage.c > @@ -486,7 +486,6 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc, > struct buffer_head map_bh; > loff_t i_size = i_size_read(inode); > int ret = 0; > - int wr = (wbc->sync_mode == WB_SYNC_ALL ? WRITE_SYNC : WRITE); > > if (page_has_buffers(page)) { > struct buffer_head *head = page_buffers(page); > @@ -595,7 +594,7 @@ page_is_mapped: > * This page will go to BIO. Do we need to send this BIO off first? > */ > if (bio && mpd->last_block_in_bio != blocks[0] - 1) > - bio = mpage_bio_submit(wr, bio); > + bio = mpage_bio_submit(wbc_to_write_cmd(wbc), bio); > > alloc_new: > if (bio == NULL) { > @@ -622,7 +621,7 @@ alloc_new: > wbc_account_io(wbc, page, PAGE_SIZE); > length = first_unmapped << blkbits; > if (bio_add_page(bio, page, length, 0) < length) { > - bio = mpage_bio_submit(wr, bio); > + bio = mpage_bio_submit(wbc_to_write_cmd(wbc), bio); > goto alloc_new; > } > > @@ -632,7 +631,7 @@ alloc_new: > set_page_writeback(page); > unlock_page(page); > if (boundary || (first_unmapped != blocks_per_page)) { > - bio = mpage_bio_submit(wr, bio); > + bio = mpage_bio_submit(wbc_to_write_cmd(wbc), bio); > if (boundary_block) { > write_boundary_block(boundary_bdev, > boundary_block, 1 << blkbits); > @@ -644,7 +643,7 @@ alloc_new: > > confused: > if (bio) > - bio = mpage_bio_submit(wr, bio); > + bio = mpage_bio_submit(wbc_to_write_cmd(wbc), bio); > > if (mpd->use_writepage) { > ret = mapping->a_ops->writepage(page, wbc); > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c > index e49b2406d15d..e6c721f4153b 100644 > --- a/fs/xfs/xfs_aops.c > +++ b/fs/xfs/xfs_aops.c > @@ -393,7 +393,7 @@ xfs_submit_ioend_bio( > atomic_inc(&ioend->io_remaining); > bio->bi_private = ioend; > bio->bi_end_io = xfs_end_bio; > - submit_bio(wbc->sync_mode == WB_SYNC_ALL ? WRITE_SYNC : WRITE, bio); > + submit_bio(wbc_to_write_cmd(wbc), bio); > } > > STATIC struct bio * > diff --git a/include/linux/writeback.h b/include/linux/writeback.h > index d0b5ca5d4e08..aa66fa05ff0d 100644 > --- a/include/linux/writeback.h > +++ b/include/linux/writeback.h > @@ -100,6 +100,14 @@ struct writeback_control { > #endif > }; > > +static inline int wbc_to_write_cmd(struct writeback_control *wbc) > +{ > + if (wbc->sync_mode == WB_SYNC_ALL) > + return WRITE_SYNC; > + > + return WRITE; > +} > + > /* > * A wb_domain represents a domain that wb's (bdi_writeback's) belong to > * and are measured against each other in. There always is one global > -- > 2.8.0.rc4.6.g7e4ba36 > -- Jan Kara SUSE Labs, CR