Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751784AbdG0Inq (ORCPT ); Thu, 27 Jul 2017 04:43:46 -0400 Received: from mx2.suse.de ([195.135.220.15]:54626 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751759AbdG0Ino (ORCPT ); Thu, 27 Jul 2017 04:43:44 -0400 Date: Thu, 27 Jul 2017 10:43:41 +0200 From: Jan Kara To: Jeff Layton Cc: Alexander Viro , Jan Kara , "J . Bruce Fields" , Andrew Morton , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Matthew Wilcox , Bob Peterson , Steven Whitehouse , cluster-devel@redhat.com Subject: Re: [PATCH v2 1/4] mm: consolidate dax / non-dax checks for writeback Message-ID: <20170727084341.GB21100@quack2.suse.cz> References: <20170726175538.13885-1-jlayton@kernel.org> <20170726175538.13885-2-jlayton@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170726175538.13885-2-jlayton@kernel.org> 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: 2159 Lines: 68 On Wed 26-07-17 13:55:35, Jeff Layton wrote: > From: Jeff Layton > > We have this complex conditional copied to several places. Turn it into > a helper function. > > Signed-off-by: Jeff Layton Looks good. You can add: Reviewed-by: Jan Kara Honza > --- > mm/filemap.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/mm/filemap.c b/mm/filemap.c > index e1cca770688f..72e46e6f0d9a 100644 > --- a/mm/filemap.c > +++ b/mm/filemap.c > @@ -522,12 +522,17 @@ int filemap_fdatawait(struct address_space *mapping) > } > EXPORT_SYMBOL(filemap_fdatawait); > > +static bool mapping_needs_writeback(struct address_space *mapping) > +{ > + return (!dax_mapping(mapping) && mapping->nrpages) || > + (dax_mapping(mapping) && mapping->nrexceptional); > +} > + > int filemap_write_and_wait(struct address_space *mapping) > { > int err = 0; > > - if ((!dax_mapping(mapping) && mapping->nrpages) || > - (dax_mapping(mapping) && mapping->nrexceptional)) { > + if (mapping_needs_writeback(mapping)) { > err = filemap_fdatawrite(mapping); > /* > * Even if the above returned error, the pages may be > @@ -566,8 +571,7 @@ int filemap_write_and_wait_range(struct address_space *mapping, > { > int err = 0; > > - if ((!dax_mapping(mapping) && mapping->nrpages) || > - (dax_mapping(mapping) && mapping->nrexceptional)) { > + if (mapping_needs_writeback(mapping)) { > err = __filemap_fdatawrite_range(mapping, lstart, lend, > WB_SYNC_ALL); > /* See comment of filemap_write_and_wait() */ > @@ -656,8 +660,7 @@ int file_write_and_wait_range(struct file *file, loff_t lstart, loff_t lend) > int err = 0, err2; > struct address_space *mapping = file->f_mapping; > > - if ((!dax_mapping(mapping) && mapping->nrpages) || > - (dax_mapping(mapping) && mapping->nrexceptional)) { > + if (mapping_needs_writeback(mapping)) { > err = __filemap_fdatawrite_range(mapping, lstart, lend, > WB_SYNC_ALL); > /* See comment of filemap_write_and_wait() */ > -- > 2.13.3 > -- Jan Kara SUSE Labs, CR