From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752665Ab2AGRSq (ORCPT ); Sat, 7 Jan 2012 12:18:46 -0500 Received: from oproxy4-pub.bluehost.com ([69.89.21.11]:39417 "HELO oproxy4-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750971Ab2AGRSo (ORCPT ); Sat, 7 Jan 2012 12:18:44 -0500 Message-ID: <4F088C21.2080501@xenotime.net> Date: Sat, 07 Jan 2012 10:17:05 -0800 From: Randy Dunlap Organization: YPO4 User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110323 Thunderbird/3.1.9 MIME-Version: 1.0 To: Wu Fengguang CC: Linus Torvalds , Stephen Rothwell , linux-next@vger.kernel.org, LKML , Al Viro , Andrew Morton Subject: Re: [PATCH -next] fs: fix fs/fs-writeback.c build error References: <20120105191218.42825638a431bc1aba4879de@canb.auug.org.au> <4F063DD6.5050403@xenotime.net> <20120107133008.GA21128@localhost> In-Reply-To: <20120107133008.GA21128@localhost> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Identified-User: {1807:box742.bluehost.com:xenotime:xenotime.net} {sentby:smtp auth 50.53.38.135 authed with rdunlap@xenotime.net} Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/07/2012 05:30 AM, Wu Fengguang wrote: > On Fri, Jan 06, 2012 at 03:01:09PM -0800, Linus Torvalds wrote: >> On Thu, Jan 5, 2012 at 4:18 PM, Randy Dunlap wrote: >>> >>> In linux-next, fs/fs-writeback.c no longer #includes , >>> which #included , so add that latter header file to >>> to fix the build error: >>> >>> fs/fs-writeback.c:510:11: error: 'PAGE_CACHE_SHIFT' undeclared (first use in this function) >> >> I would actually suggest: >> >> - move the whole MIN_WRITEBACK_PAGES #define from the header file to >> fs/writeback.c > > Done. > >> (why expose such a random #define to outside users that >> have nothing to do with it?) > > Yeah, there were some early patches that reference MIN_WRITEBACK_PAGES > from other files, which are dropped later.. > >> - make sure that fs/fs-writeback.c has that pagemap.h #include. > > Done. (otherwise it won't compile) > >> There's no reason why should include filemap.h per >> se, and there is no reason why it should expose some internal chunking >> #define to anybody else. > > Good point. I'll queue this patch to writeback-for-next: > > Subject: writeback: move MIN_WRITEBACK_PAGES to fs-writeback.c > Date: Sat Jan 07 20:41:55 CST 2012 > > Fix compile error > > fs/fs-writeback.c:515:33: error: ‘PAGE_CACHE_SHIFT’ undeclared (first use in this function) > > Reported-by: Randy Dunlap > Signed-off-by: Wu Fengguang Acked-by: Randy Dunlap Thanks. > --- > fs/fs-writeback.c | 6 ++++++ > include/linux/writeback.h | 5 ----- > 2 files changed, 6 insertions(+), 5 deletions(-) > > --- next.orig/fs/fs-writeback.c 2012-01-07 21:01:34.552000061 +0800 > +++ next/fs/fs-writeback.c 2012-01-07 21:22:45.504000051 +0800 > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -29,6 +30,11 @@ > #include "internal.h" > > /* > + * 4MB minimal write chunk size > + */ > +#define MIN_WRITEBACK_PAGES (4096UL >> (PAGE_CACHE_SHIFT - 10)) > + > +/* > * Passed into wb_writeback(), essentially a subset of writeback_control > */ > struct wb_writeback_work { > --- next.orig/include/linux/writeback.h 2012-01-07 21:01:34.544000059 +0800 > +++ next/include/linux/writeback.h 2012-01-07 21:13:09.008000026 +0800 > @@ -25,11 +25,6 @@ DECLARE_PER_CPU(int, dirty_throttle_leak > #define DIRTY_SCOPE 8 > #define DIRTY_FULL_SCOPE (DIRTY_SCOPE / 2) > > -/* > - * 4MB minimal write chunk size > - */ > -#define MIN_WRITEBACK_PAGES (4096UL >> (PAGE_CACHE_SHIFT - 10)) > - > struct backing_dev_info; > > /* -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***