Whamcloud - gitweb
libext2fs: add verity flag to EXT2_LIB_FEATURE_RO_COMPAT_SUPP
authorEric Biggers <ebiggers@google.com>
Tue, 21 Aug 2018 00:15:52 +0000 (17:15 -0700)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 21 Aug 2018 05:22:24 +0000 (01:22 -0400)
The new ro_compat filesystem feature flag for fs-verity was added to
EXT2_FEATURE_RO_COMPAT_SUPP, but that's not actually used by e2fsprogs
itself.  So contrary to the v1.44.4 release notes, 'mke2fs -O verity'
doesn't actually work, nor does e2fsck allow the filesystem to have the
verity feature.  Fix it by adding the flag to the correct place
(EXT2_LIB_FEATURE_RO_COMPAT_SUPP) too.

Fixes: faae7aa00df0 ("Reserve codepoints for the fsverity feature.")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
lib/ext2fs/ext2fs.h

index 3d4afac..c86596a 100644 (file)
@@ -625,7 +625,8 @@ typedef struct ext2_icount *ext2_icount_t;
                                         EXT4_FEATURE_RO_COMPAT_METADATA_CSUM|\
                                         EXT4_FEATURE_RO_COMPAT_READONLY |\
                                         EXT4_FEATURE_RO_COMPAT_PROJECT |\
-                                        EXT4_FEATURE_RO_COMPAT_SHARED_BLOCKS)
+                                        EXT4_FEATURE_RO_COMPAT_SHARED_BLOCKS |\
+                                        EXT4_FEATURE_RO_COMPAT_VERITY)
 
 /*
  * These features are only allowed if EXT2_FLAG_SOFTSUPP_FEATURES is passed