From: Eric Sandeen Date: Tue, 27 Nov 2012 18:35:48 +0000 (-0600) Subject: tune2fs: respect quota config option X-Git-Tag: v1.42.7~84 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=44a2cca35e9292c39bcad38288fdf7a78d6f56af;p=tools%2Fe2fsprogs.git tune2fs: respect quota config option If we haven't turned --enable-quota on at config time, I don't think tune2fs should know about the feature either. Today we can actually tune2fs -O quota even if not configured on, and then the rest of the tools will refuse to touch it: # tune2fs -O quota /dev/sda1 # tune2fs -O ^quota /dev/whatever complains tune2fs 1.42.3 (14-May-2012) tune2fs: Filesystem has unsupported read-only feature(s) while trying to open /dev/sda1 # fsck /dev/sda1 fsck from util-linux 2.21.2 e2fsck 1.42.3 (14-May-2012) /dev/sda1 has unsupported feature(s): quota e2fsck: Get a newer version of e2fsck! Ok, so turn it off? # tune2fs -O ^quota /dev/whatever complains tune2fs 1.42.3 (14-May-2012) tune2fs: Filesystem has unsupported read-only feature(s) while trying to open /dev/sda1 Nope. Debugfs? Nope. # debugfs -w /dev/sda1 debugfs 1.42.3 (14-May-2012) /dev/sda1: Filesystem has unsupported read-only feature(s) while opening filesystem Signed-off-by: Eric Sandeen Reported-by: Bert DeKnuydt Addresses-Red-Hat-Bugzilla: #880596 Signed-off-by: Theodore Ts'o --- diff --git a/misc/tune2fs.c b/misc/tune2fs.c index fb46fb6..ef90f5c 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -142,7 +142,9 @@ static __u32 ok_features[3] = { 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 +#endif }; static __u32 clear_ok_features[3] = { @@ -160,7 +162,9 @@ static __u32 clear_ok_features[3] = { 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 +#endif }; /*