From: Eric Biggers Date: Tue, 21 Aug 2018 00:15:52 +0000 (-0700) Subject: libext2fs: add verity flag to EXT2_LIB_FEATURE_RO_COMPAT_SUPP X-Git-Tag: v1.44.5~37 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76e28a1339890a33ac07eb09d2db753ef1ee7eee;p=thirdparty%2Fe2fsprogs.git libext2fs: add verity flag to EXT2_LIB_FEATURE_RO_COMPAT_SUPP 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 Signed-off-by: Theodore Ts'o --- diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index 3d4afac4b..c86596a68 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -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