volume_id/ext: use common bb_e2fs_defs.h for ext2/3/4 constants and structs

[oweals/busybox.git] / include / bb_e2fs_defs.h

diff --git a/include/bb_e2fs_defs.h b/include/bb_e2fs_defs.h
index 7974497ca8b21b50437e6f99438a2690f20b03bd..071c660c50c734e1cac24295d0903f1f887f2153 100644 (file)
--- a/include/bb_e2fs_defs.h
+++ b/include/bb_e2fs_defs.h
@@ -463,6 +463,7 @@ struct ext2_super_block {
 #define EXT2_HAS_INCOMPAT_FEATURE(sb,mask)                     \
        ( EXT2_SB(sb)->s_feature_incompat & (mask) )
 
+/* for s_feature_compat */
 #define EXT2_FEATURE_COMPAT_DIR_PREALLOC       0x0001
 #define EXT2_FEATURE_COMPAT_IMAGIC_INODES      0x0002
 #define EXT3_FEATURE_COMPAT_HAS_JOURNAL                0x0004
@@ -470,23 +471,45 @@ struct ext2_super_block {
 #define EXT2_FEATURE_COMPAT_RESIZE_INO         0x0010
 #define EXT2_FEATURE_COMPAT_DIR_INDEX          0x0020
 
+/* for s_feature_ro_compat */
 #define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER    0x0001
 #define EXT2_FEATURE_RO_COMPAT_LARGE_FILE      0x0002
-/* #define EXT2_FEATURE_RO_COMPAT_BTREE_DIR    0x0004 not used */
+#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR       0x0004 /* not used */
+#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE       0x0008
+#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM                0x0010
+#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK       0x0020
+#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE     0x0040
 
+/* for s_feature_incompat */
 #define EXT2_FEATURE_INCOMPAT_COMPRESSION      0x0001
 #define EXT2_FEATURE_INCOMPAT_FILETYPE         0x0002
-#define EXT3_FEATURE_INCOMPAT_RECOVER          0x0004 /* Needs recovery */
-#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV      0x0008 /* Journal device */
+#define EXT3_FEATURE_INCOMPAT_RECOVER          0x0004
+#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV      0x0008
 #define EXT2_FEATURE_INCOMPAT_META_BG          0x0010
-#define EXT3_FEATURE_INCOMPAT_EXTENTS          0x0040
+#define EXT4_FEATURE_INCOMPAT_EXTENTS          0x0040
+#define EXT4_FEATURE_INCOMPAT_64BIT            0x0080
+#define EXT4_FEATURE_INCOMPAT_MMP              0x0100
+#define EXT4_FEATURE_INCOMPAT_FLEX_BG          0x0200
 
 
 #define EXT2_FEATURE_COMPAT_SUPP       0
-#define EXT2_FEATURE_INCOMPAT_SUPP     (EXT2_FEATURE_INCOMPAT_FILETYPE)
 #define EXT2_FEATURE_RO_COMPAT_SUPP    (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
                                         EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
                                         EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
+#define EXT2_FEATURE_INCOMPAT_SUPP     (EXT2_FEATURE_INCOMPAT_FILETYPE| \
+                                        EXT2_FEATURE_INCOMPAT_META_BG)
+#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED      (~EXT2_FEATURE_INCOMPAT_SUPP)
+#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED     (~EXT2_FEATURE_RO_COMPAT_SUPP)
+
+#define EXT3_FEATURE_RO_COMPAT_SUPP    (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
+                                        EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
+                                        EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
+#define EXT3_FEATURE_INCOMPAT_SUPP     (EXT2_FEATURE_INCOMPAT_FILETYPE| \
+                                        EXT3_FEATURE_INCOMPAT_RECOVER| \
+                                        EXT2_FEATURE_INCOMPAT_META_BG)
+#define EXT3_FEATURE_INCOMPAT_UNSUPPORTED      (~EXT3_FEATURE_INCOMPAT_SUPP)
+#define EXT3_FEATURE_RO_COMPAT_UNSUPPORTED     (~EXT3_FEATURE_RO_COMPAT_SUPP)
+
 
 /*
  * Default values for user and/or group using reserved blocks