Patchwork linux-next: build failure after merge of the ext4 tree

login
register
mail settings
Submitter Aditya Kali
Date July 10, 2012, 1:48 a.m.
Message ID <CAGr1F2EB=BR+GSq34TYB+QE+3FNwzvBwBemYPpPu+=wENQf-ZA@mail.gmail.com>
Download mbox | patch
Permalink /patch/170016/
State Superseded
Headers show

Comments

Aditya Kali - July 10, 2012, 1:48 a.m.
Sorry for the trouble. The following patch should fix the build.


From: Aditya Kali <adityakali@google.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@google.com>
---
 fs/ext4/super.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

 			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);

Patch

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)) {