volume_id: recognize compressed hibernate swap signature

[oweals/busybox.git] / util-linux / volume_id / ext.c

diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c
index 3c07f5301abdea85434f1e8b8a597947bc9696fc..80c217f9829347e6b9240fe0ca7a7859b9134eb2 100644 (file)
--- a/util-linux/volume_id/ext.c
+++ b/util-linux/volume_id/ext.c
@@ -37,35 +37,38 @@ struct ext2_super_block {
        uint32_t        feature_ro_compat;
        uint8_t uuid[16];
        uint8_t volume_name[16];
-} __attribute__((__packed__));
+} PACKED;
 
 #define EXT3_FEATURE_COMPAT_HAS_JOURNAL                0x00000004
 #define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV      0x00000008
 #define EXT_SUPERBLOCK_OFFSET                  0x400
 
-int volume_id_probe_ext(struct volume_id *id, uint64_t off)
+int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/)
 {
+#define off ((uint64_t)0)
        struct ext2_super_block *es;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       dbg("ext: probing at offset 0x%llx", (unsigned long long) off);
 
        es = volume_id_get_buffer(id, off + EXT_SUPERBLOCK_OFFSET, 0x200);
        if (es == NULL)
                return -1;
 
-       if (es->magic[0] != 0123 ||
-           es->magic[1] != 0357)
+       if (es->magic[0] != 0123 || es->magic[1] != 0357) {
+               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_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);
+       dbg("ext: label '%s' uuid '%s'", id->label, id->uuid);
 
-       if ((le32_to_cpu(es->feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0)
-               id->type = "ext3";
-       else
-               id->type = "ext2";
+//     if ((le32_to_cpu(es->feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0)
+//             id->type = "ext3";
+//     else
+//             id->type = "ext2";
 
        return 0;
 }