Merge changes from topic 'ext4_encryption_flag'
* changes:
ext4_sb.h: make feature flags in fs_info 32-bit
ext4.h: add EXT4_FEATURE_INCOMPAT_ENCRYPT
diff --git a/ext4_utils/include/ext4_utils/ext4.h b/ext4_utils/include/ext4_utils/ext4.h
index 219737e..6cc8f02 100644
--- a/ext4_utils/include/ext4_utils/ext4.h
+++ b/ext4_utils/include/ext4_utils/ext4.h
@@ -508,6 +508,7 @@
#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
#define EXT4_FEATURE_INCOMPAT_EA_INODE 0x0400
#define EXT4_FEATURE_INCOMPAT_DIRDATA 0x1000
+#define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000
#define EXT4_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR
#define EXT4_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE| EXT4_FEATURE_INCOMPAT_RECOVER| EXT4_FEATURE_INCOMPAT_META_BG| EXT4_FEATURE_INCOMPAT_EXTENTS| EXT4_FEATURE_INCOMPAT_64BIT| EXT4_FEATURE_INCOMPAT_FLEX_BG)
diff --git a/ext4_utils/include/ext4_utils/ext4_sb.h b/ext4_utils/include/ext4_utils/ext4_sb.h
index 45e0ec9..ab8b42f 100644
--- a/ext4_utils/include/ext4_utils/ext4_sb.h
+++ b/ext4_utils/include/ext4_utils/ext4_sb.h
@@ -39,9 +39,9 @@
uint32_t inode_size;
uint32_t inodes;
uint32_t journal_blocks;
- uint16_t feat_ro_compat;
- uint16_t feat_compat;
- uint16_t feat_incompat;
+ uint32_t feat_ro_compat;
+ uint32_t feat_compat;
+ uint32_t feat_incompat;
uint32_t bg_desc_reserve_blocks;
const char *label;
uint8_t no_journal;