From 0015d5c33fd77a3d16da4a78e4bf09464bb72f3f Mon Sep 17 00:00:00 2001
From: Niu Yawei <niu@whamcloud.com>
Date: Mon, 11 Jun 2012 06:33:55 -0700
Subject: [PATCH] LU-1502 build: enable quota when building

The quota support is disabled by default, but we need to enable it
explicitly when build e2fsprogs for Lustre 2.4.

Signed-off-by: Niu Yawei <niu@whamcloud.com>
Change-Id: Ic09f7c100b254559a5223460242b3bf465ff0802
---
 configure                       | 11 ++++++++---
 configure.in                    |  8 ++++++--
 e2fsprogs-RHEL-6.spec.in        |  2 +-
 e2fsprogs-SUSE_LINUX-11.spec.in |  1 +
 e2fsprogs.spec.in               |  2 +-
 misc/mke2fs.c                   |  2 ++
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index e330a70..ff7c236 100755
--- a/configure
+++ b/configure
@@ -1509,7 +1509,7 @@ Optional Features:
   --disable-testio-debug  disable the use of the test I/O manager for debugging
   --disable-libuuid	  do not build private uuid library
   --disable-libblkid	  do not build private blkid library
-  --enable-quota	  enable quota support
+  --disable-quota	  disable quota support
   --disable-debugfs   	  disable support of debugfs program
   --disable-e2scan   	  disable support of e2scan program
   --disable-imager   	  disable support of e2image program
@@ -5470,16 +5470,21 @@ if test "${enable_quota+set}" = set; then :
 then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling quota support" >&5
 $as_echo "Disabling quota support" >&6; }
+	QUOTA_CMT="#"
 else
 	$as_echo "#define CONFIG_QUOTA 1" >>confdefs.h
 
+	QUOTA_CMT=
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling quota support" >&5
 $as_echo "Enabling quota support" >&6; }
 fi
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling quota support by default" >&5
-$as_echo "Disabling quota support by default" >&6; }
+  $as_echo "#define CONFIG_QUOTA 1" >>confdefs.h
+
+QUOTA_CMT=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling quota support by default" >&5
+$as_echo "Enabling quota support by default" >&6; }
 
 fi
 
diff --git a/configure.in b/configure.in
index 7afc540..f7b214c 100644
--- a/configure.in
+++ b/configure.in
@@ -638,16 +638,20 @@ dnl
 PKG_PROG_PKG_CONFIG
 AH_TEMPLATE([CONFIG_QUOTA], [Define to 1 to enable quota support])
 AC_ARG_ENABLE([quota],
-[  --enable-quota	  enable quota support],
+[  --disable-quota	  disable quota support],
 if test "$enableval" = "no"
 then
 	AC_MSG_RESULT([Disabling quota support])
+	QUOTA_CMT="#"
 else
 	AC_DEFINE(CONFIG_QUOTA, 1)
+	QUOTA_CMT=
 	AC_MSG_RESULT([Enabling quota support])
 fi
 ,
-AC_MSG_RESULT([Disabling quota support by default])
+AC_DEFINE(CONFIG_QUOTA, 1)
+QUOTA_CMT=
+AC_MSG_RESULT([Enabling quota support by default])
 )
 dnl
 dnl Define stuff expected for quota library
diff --git a/e2fsprogs-RHEL-6.spec.in b/e2fsprogs-RHEL-6.spec.in
index 40c335e..487704d 100644
--- a/e2fsprogs-RHEL-6.spec.in
+++ b/e2fsprogs-RHEL-6.spec.in
@@ -158,7 +158,7 @@ It was originally inspired by the Multics SubSystem library.
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
 	   --disable-e2initrd-helper --disable-libblkid --disable-libuuid \
-	   --disable-defrag --enable-symlink-install \
+	   --disable-defrag --enable-symlink-install --enable-quota \
 	   @WITH_LUSTRE@ @ENABLE_LFSCK@ \
 	   %{?extra_config_flags:%extra_config_flags}
 make %{?_smp_mflags}
diff --git a/e2fsprogs-SUSE_LINUX-11.spec.in b/e2fsprogs-SUSE_LINUX-11.spec.in
index 1a5c685..8103892 100644
--- a/e2fsprogs-SUSE_LINUX-11.spec.in
+++ b/e2fsprogs-SUSE_LINUX-11.spec.in
@@ -173,6 +173,7 @@ autoreconf --force --install
   --disable-libuuid \
   --disable-uuidd \
   --disable-fsck \
+  --enable-quota \
   @WITH_LUSTRE@ @ENABLE_LFSCK@ \
   %{?extra_config_flags:%extra_config_flags} CFLAGS="$RPM_OPT_FLAGS"
 make V=1
diff --git a/e2fsprogs.spec.in b/e2fsprogs.spec.in
index d4d3db9..d6b5630 100644
--- a/e2fsprogs.spec.in
+++ b/e2fsprogs.spec.in
@@ -75,7 +75,7 @@ SMP systems.
 %setup
 
 %build
-%configure --enable-elf-shlibs --enable-nls --disable-defrag \
+%configure --enable-elf-shlibs --enable-nls --disable-defrag --enable-quota \
 	@WITH_LUSTRE@ @ENABLE_LFSCK@ \
 	%{?extra_config_flags:%extra_config_flags}
 make
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index caee879..3ba073c 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1950,11 +1950,13 @@ profile_error:
 				  "See https://ext4.wiki.kernel.org/"
 				  "index.php/Bigalloc for more information\n\n"));
 
+#ifndef HAVE_LFSCK
 	if (fs_param.s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_QUOTA)
 		fprintf(stderr, _("\nWarning: the quota feature is still "
 				  "under development\n"
 				  "See https://ext4.wiki.kernel.org/"
 				  "index.php/Quota for more information\n\n"));
+#endif
 
 	/* Since sparse_super is the default, we would only have a problem
 	 * here if it was explicitly disabled.
-- 
1.8.3.1