OSDN Git Service

tune2fs: fix a compile-time bug if quota is not enabled
authorTheodore Ts'o <tytso@mit.edu>
Thu, 29 Nov 2012 19:58:29 +0000 (14:58 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 29 Nov 2012 19:58:29 +0000 (14:58 -0500)
Commit 44a2cca35e introduced a compile-time failure if --enable-quota
is not passed to the configure script.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
misc/tune2fs.c

index ef90f5c..84fe4ce 100644 (file)
@@ -141,10 +141,10 @@ static __u32 ok_features[3] = {
                EXT4_FEATURE_RO_COMPAT_DIR_NLINK|
                EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE|
                EXT4_FEATURE_RO_COMPAT_GDT_CSUM |
-               EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER |
 #ifdef CONFIG_QUOTA
-               EXT4_FEATURE_RO_COMPAT_QUOTA
+               EXT4_FEATURE_RO_COMPAT_QUOTA |
 #endif
+               EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER
 };
 
 static __u32 clear_ok_features[3] = {
@@ -161,10 +161,10 @@ static __u32 clear_ok_features[3] = {
                EXT4_FEATURE_RO_COMPAT_HUGE_FILE|
                EXT4_FEATURE_RO_COMPAT_DIR_NLINK|
                EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE|
-               EXT4_FEATURE_RO_COMPAT_GDT_CSUM |
 #ifdef CONFIG_QUOTA
-               EXT4_FEATURE_RO_COMPAT_QUOTA
+               EXT4_FEATURE_RO_COMPAT_QUOTA |
 #endif
+               EXT4_FEATURE_RO_COMPAT_GDT_CSUM
 };
 
 /*