Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Sender: "saranyamohan via sendgmr" 
        <saranyamohan@saranyamohan.svl.corp.google.com>
Date:   Wed, 18 Nov 2020 07:39:37 -0800
In-Reply-To: <20201118153947.3394530-1-saranyamohan@google.com>
Message-Id: <20201118153947.3394530-52-saranyamohan@google.com>
Mime-Version: 1.0
References: <20201118153947.3394530-1-saranyamohan@google.com>
Subject: [RFC PATCH v3 51/61] configure: enable pfsck by default
From:   Saranya Muruganandam <saranyamohan@google.com>
To:     linux-ext4@vger.kernel.org, tytso@mit.edu
Cc:     adilger.kernel@dilger.ca, Wang Shilong <wshilong@ddn.com>,
        Saranya Muruganandam <saranyamohan@google.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

From: Wang Shilong <wshilong@ddn.com>

Since most of work has been done, compile e2fsprogs
with pfsck enabled by default.

So it could testing widely now.

Signed-off-by: Wang Shilong <wshilong@ddn.com>
Signed-off-by: Saranya Muruganandam <saranyamohan@google.com>
---
 configure    | 13 +++++++++++--
 configure.ac | 13 ++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 1bb7a325..511de4a1 100755
--- a/configure
+++ b/configure
@@ -1589,7 +1589,7 @@ Optional Features:
   --disable-tdb           disable tdb support
   --disable-bmap-stats    disable collection of bitmap stats.
   --enable-bmap-stats-ops enable collection of additional bitmap stats
-  --enable-pfsck     enable parallel e2fsck
+  --disable-pfsck     disable parallel e2fsck
   --disable-nls           do not use Native Language Support
   --enable-threads={posix|solaris|pth|windows}
                           specify multithreading API
@@ -6169,8 +6169,17 @@ $as_echo "Enabling parallel e2fsck" >&6; }
 fi
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling parallel e2fsck" >&5
+  if test -z "PTHREAD_LIB"
+then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling parallel e2fsck" >&5
 $as_echo "Disabling parallel e2fsck" >&6; }
+else
+
+$as_echo "#define CONFIG_PFSCK 1" >>confdefs.h
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling parallel e2fsck by default" >&5
+$as_echo "Enabling parallel e2fsck by default" >&6; }
+fi
 
 fi
 
diff --git a/configure.ac b/configure.ac
index e73dbf50..2dacd6c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -877,13 +877,13 @@ fi
 AC_MSG_RESULT([Disabling additional bitmap statistics by default])
 )
 dnl
-dnl handle --enable-pfsck
+dnl handle --disable-pfsck
 dnl
 PTHREAD_LIB=''
 AC_CHECK_LIB(pthread,pthread_join,PTHREAD_LIB=-pthread)
 AC_SUBST(PTHREAD_LIB)
 AC_ARG_ENABLE([pfsck],
-[  --enable-pfsck     enable parallel e2fsck],
+[  --disable-pfsck     disable parallel e2fsck],
 if test "$enableval" = "no" || test -z "PTHREAD_LIB"
 then
 	AC_MSG_RESULT([Disabling parallel e2fsck])
@@ -893,7 +893,14 @@ else
 	AC_MSG_RESULT([Enabling parallel e2fsck])
 fi
 ,
-AC_MSG_RESULT([Disabling parallel e2fsck])
+if test -z "PTHREAD_LIB"
+then
+	AC_MSG_RESULT([Disabling parallel e2fsck])
+else
+	AC_DEFINE(CONFIG_PFSCK, 1,
+		[Define to 1 if parallel e2fsck is enabled])
+	AC_MSG_RESULT([Enabling parallel e2fsck by default])
+fi
 )
 dnl
 dnl
-- 
2.29.2.299.gdc1121823c-goog