lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 9 Jul 2012 18:48:02 -0700 From: Aditya Kali <adityakali@...gle.com> To: Stephen Rothwell <sfr@...b.auug.org.au>, wfg@...ux.intel.com Cc: "Theodore Ts'o" <tytso@....edu>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Jan Kara <jack@...e.cz>, Johann Lombardi <johann@...mcloud.com>, ext4 development <linux-ext4@...r.kernel.org>, kernel-janitors@...r.kernel.org Subject: Re: linux-next: build failure after merge of the ext4 tree Sorry for the trouble. The following patch should fix the build. From: Aditya Kali <adityakali@...gle.com> 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 <adityakali@...gle.com> --- 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 <sfr@...b.auug.org.au> 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@...b.auug.org.au -- Aditya -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists