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 <yawei.niu@intel.com>
Change-Id: Ic09f7c100b254559a5223460242b3bf465ff0802

diff --git a/configure b/configure
index 7443e63..c266f3f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1514,7 +1514,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-backtrace    disable use backtrace
   --disable-debugfs      disable support of debugfs program
   --disable-e2scan       disable support of e2scan program
@@ -5498,10 +5498,12 @@ then
        QUOTA_CMT=#
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling quota support" >&5
 $as_echo "Disabling quota support" >&6; }
+       QUOTA_CMT="#"
 else
        QUOTA_CMT=
        $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; }
        QUOTA_MAN_COMMENT=""
@@ -5509,9 +5511,11 @@ $as_echo "Enabling quota support" >&6; }
 fi
 
 else
-  QUOTA_CMT=#
-{ $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 fb1ef3a..98fa9de 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -660,21 +660,24 @@ AC_SUBST(QUOTA_MAN_COMMENT)
 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
        QUOTA_CMT=#
        AC_MSG_RESULT([Disabling quota support])
+       QUOTA_CMT="#"
 else
        QUOTA_CMT=
        AC_DEFINE(CONFIG_QUOTA, 1)
+       QUOTA_CMT=
        AC_MSG_RESULT([Enabling quota support])
        QUOTA_MAN_COMMENT=""
        AC_SUBST(QUOTA_MAN_COMMENT)
 fi
 ,
-QUOTA_CMT=#
-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 579c159..d3f9c27 100644 (file)
--- 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 d6ee4d4..b63ecad 100644 (file)
--- a/e2fsprogs-SUSE_LINUX-11.spec.in
+++ b/e2fsprogs-SUSE_LINUX-11.spec.in
@@ -174,6 +174,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 9a3ad58..71a2a37 100644 (file)
--- 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 000bd6c..c0a9f89 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -2143,12 +2143,14 @@ profile_error:
                                  "See https://ext4.wiki.kernel.org/"
                                  "index.php/Bigalloc for more information\n\n"));
 
+#ifndef HAVE_LFSCK
        if (!quiet &&
            (fs_param.s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_QUOTA))
                fprintf(stderr, "%s", _("\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.

diff --git a/tests/m_quota/expect.1 b/tests/m_quota/expect.1
index 830046e..4d83f38 100644 (file)
--- a/tests/m_quota/expect.1
+++ b/tests/m_quota/expect.1
@@ -1,7 +1,3 @@
-
-Warning: the quota feature is still under development
-See https://ext4.wiki.kernel.org/index.php/Quota for more information
-
 Filesystem label=
 OS type: Linux
 Block size=1024 (log=0)