[PATCH] udev_volume_id: volume_id version 034

[elogind.git] / extras / volume_id / volume_id / ext / ext.c

diff --git a/extras/volume_id/volume_id/ext/ext.c b/extras/volume_id/volume_id/ext/ext.c
index 50ffa8537288a2020819fbecd02fc488ea0fa5fd..0940e452fc6e656305e1fc98a9d6c058a34cf773 100644 (file)
--- a/extras/volume_id/volume_id/ext/ext.c
+++ b/extras/volume_id/volume_id/ext/ext.c
@@ -39,30 +39,34 @@
 #include "../logging.h"
 #include "ext.h"
 
+struct ext2_super_block {
+       __u32   inodes_count;
+       __u32   blocks_count;
+       __u32   r_blocks_count;
+       __u32   free_blocks_count;
+       __u32   free_inodes_count;
+       __u32   first_data_block;
+       __u32   log_block_size;
+       __u32   dummy3[7];
+       __u8    magic[2];
+       __u16   state;
+       __u32   dummy5[8];
+       __u32   feature_compat;
+       __u32   feature_incompat;
+       __u32   feature_ro_compat;
+       __u8    uuid[16];
+       __u8    volume_name[16];
+} __attribute__((__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, __u64 off)
 {
-       struct ext2_super_block {
-               __u32   inodes_count;
-               __u32   blocks_count;
-               __u32   r_blocks_count;
-               __u32   free_blocks_count;
-               __u32   free_inodes_count;
-               __u32   first_data_block;
-               __u32   log_block_size;
-               __u32   dummy3[7];
-               __u8    magic[2];
-               __u16   state;
-               __u32   dummy5[8];
-               __u32   feature_compat;
-               __u32   feature_incompat;
-               __u32   feature_ro_compat;
-               __u8    uuid[16];
-               __u8    volume_name[16];
-       } __attribute__((__packed__)) *es;
+       struct ext2_super_block *es;
+
+       dbg("probing at offset %llu", off);
 
        es = (struct ext2_super_block *) volume_id_get_buffer(id, off + EXT_SUPERBLOCK_OFFSET, 0x200);
        if (es == NULL)