From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755379Ab2GJBs2 (ORCPT ); Mon, 9 Jul 2012 21:48:28 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:39675 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752009Ab2GJBsY (ORCPT ); Mon, 9 Jul 2012 21:48:24 -0400 MIME-Version: 1.0 In-Reply-To: <20120710112312.099a2f602cd6aea90226732c@canb.auug.org.au> References: <20120710112312.099a2f602cd6aea90226732c@canb.auug.org.au> From: Aditya Kali Date: Mon, 9 Jul 2012 18:48:02 -0700 Message-ID: Subject: Re: linux-next: build failure after merge of the ext4 tree To: Stephen Rothwell , wfg@linux.intel.com Cc: "Theodore Ts'o" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara , Johann Lombardi , ext4 development , kernel-janitors@vger.kernel.org Content-Type: text/plain; charset=UTF-8 X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sorry for the trouble. The following patch should fix the build. From: Aditya Kali Date: Mon, 9 Jul 2012 18:42:28 -0700 Subject: [PATCH] ext4: Fix compilation error for ext4_enable_quotas ext4_enable_quotas should only be called under CONFIG_QUOTA block. Signed-off-by: Aditya Kali --- fs/ext4/super.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index a9b87c3..e4b79fc 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4734,6 +4734,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) if (enable_quota) { if (sb_any_quota_suspended(sb)) dquot_resume(sb, -1); +#ifdef CONFIG_QUOTA else if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA)) { err = ext4_enable_quotas(sb); @@ -4742,6 +4743,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) goto restore_opts; } } +#endif } ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s", orig_data); -- 1.7.7.3 On Mon, Jul 9, 2012 at 6:23 PM, Stephen Rothwell wrote: > Hi Ted, > > After merging the ext4 tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > fs/ext4/super.c: In function 'ext4_remount': > fs/ext4/super.c:4739:4: error: implicit declaration of function 'ext4_enable_quotas' [-Werror=implicit-function-declaration] > > Caused by commit 182bb8fec8f5 ("ext4: make quota as first class supported > feature"). The quota code needs to be protected by CONFIG_QUOTA. > > I have used the ext4 tree from next-20120709 for today. > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au -- Aditya