1 files changed, 10 insertions, 26 deletions

diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c
index b5194a7b5..97451067f 100644
--- a/util-linux/volume_id/ext.c
+++ b/util-linux/volume_id/ext.c
@@ -19,28 +19,8 @@
  */
 
 #include "volume_id_internal.h"
+#include "bb_e2fs_defs.h"
 
-struct ext2_super_block {
-        uint32_t        inodes_count;
-        uint32_t        blocks_count;
-        uint32_t        r_blocks_count;
-        uint32_t        free_blocks_count;
-        uint32_t        free_inodes_count;
-        uint32_t        first_data_block;
-        uint32_t        log_block_size;
-        uint32_t        dummy3[7];
-        uint8_t magic[2];
-        uint16_t        state;
-        uint32_t        dummy5[8];
-        uint32_t        feature_compat;
-        uint32_t        feature_incompat;
-        uint32_t        feature_ro_compat;
-        uint8_t uuid[16];
-        uint8_t volume_name[16];
-} PACKED;
-
-#define EXT3_FEATURE_COMPAT_HAS_JOURNAL         0x00000004
-#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV       0x00000008
 #define EXT_SUPERBLOCK_OFFSET                   0x400
 
 int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/)
@@ -54,23 +34,27 @@ int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/)
         if (es == NULL)
                 return -1;
 
-        if (es->magic[0] != 0123 || es->magic[1] != 0357) {
+        if (es->s_magic != cpu_to_le16(EXT2_SUPER_MAGIC)) {
                 dbg("ext: no magic found");
                 return -1;
         }
 
 //      volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
 //      volume_id_set_label_raw(id, es->volume_name, 16);
-        volume_id_set_label_string(id, es->volume_name, 16);
-        volume_id_set_uuid(id, es->uuid, UUID_DCE);
+        volume_id_set_label_string(id, (void*)es->s_volume_name, 16);
+        volume_id_set_uuid(id, es->s_uuid, UUID_DCE);
         dbg("ext: label '%s' uuid '%s'", id->label, id->uuid);
 
 #if ENABLE_FEATURE_BLKID_TYPE
-        if ((le32_to_cpu(es->feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0)
+        if ((es->s_feature_ro_compat & cpu_to_le32(EXT4_FEATURE_RO_COMPAT_HUGE_FILE | EXT4_FEATURE_RO_COMPAT_DIR_NLINK))
+         || (es->s_feature_incompat & cpu_to_le32(EXT4_FEATURE_INCOMPAT_EXTENTS | EXT4_FEATURE_INCOMPAT_64BIT))
+        ) {
+                id->type = "ext4";
+        }
+        else if (es->s_feature_compat & cpu_to_le32(EXT3_FEATURE_COMPAT_HAS_JOURNAL))
                 id->type = "ext3";
         else
                 id->type = "ext2";
 #endif
-
         return 0;
 }