diff mbox series

libext2fs: add verity flag to EXT2_LIB_FEATURE_RO_COMPAT_SUPP

Message ID 20180821001552.25278-1-ebiggers@kernel.org
State Accepted, archived
Headers show
Series libext2fs: add verity flag to EXT2_LIB_FEATURE_RO_COMPAT_SUPP | expand

Commit Message

Eric Biggers Aug. 21, 2018, 12:15 a.m. UTC 
From: Eric Biggers <ebiggers@google.com>

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>
---
 lib/ext2fs/ext2fs.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Theodore Ts'o Aug. 21, 2018, 3:49 a.m. UTC | #1 
On Mon, Aug 20, 2018 at 05:15:52PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> 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>

Double oops!  Thanks, applied.

					- Ted
diff mbox series

Patch

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index c4a4ef01..185be5df 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -630,7 +630,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