[PATCH] udev_volume_id: volume_id version 034

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

diff --git a/extras/volume_id/volume_id/reiserfs/reiserfs.c b/extras/volume_id/volume_id/reiserfs/reiserfs.c
index 5653214e9d6fa3cbab5134f103cc3894dd2c59ca..d54013e4c556d54c875efd32dbb1c2a9f2401d60 100644 (file)
--- a/extras/volume_id/volume_id/reiserfs/reiserfs.c
+++ b/extras/volume_id/volume_id/reiserfs/reiserfs.c
@@ -39,26 +39,30 @@
 #include "../util.h"
 #include "reiserfs.h"
 
+struct reiserfs_super_block {
+       __u32   blocks_count;
+       __u32   free_blocks;
+       __u32   root_block;
+       __u32   journal_block;
+       __u32   journal_dev;
+       __u32   orig_journal_size;
+       __u32   dummy2[5];
+       __u16   blocksize;
+       __u16   dummy3[3];
+       __u8    magic[12];
+       __u32   dummy4[5];
+       __u8    uuid[16];
+       __u8    label[16];
+} __attribute__((__packed__));
+
 #define REISERFS1_SUPERBLOCK_OFFSET            0x2000
 #define REISERFS_SUPERBLOCK_OFFSET             0x10000
 
 int volume_id_probe_reiserfs(struct volume_id *id, __u64 off)
 {
-       struct reiserfs_super_block {
-               __u32   blocks_count;
-               __u32   free_blocks;
-               __u32   root_block;
-               __u32   journal_block;
-               __u32   journal_dev;
-               __u32   orig_journal_size;
-               __u32   dummy2[5];
-               __u16   blocksize;
-               __u16   dummy3[3];
-               __u8    magic[12];
-               __u32   dummy4[5];
-               __u8    uuid[16];
-               __u8    label[16];
-       } __attribute__((__packed__)) *rs;
+       struct reiserfs_super_block *rs;
+
+       dbg("probing at offset %llu", off);
 
        rs = (struct reiserfs_super_block *) volume_id_get_buffer(id, off + REISERFS_SUPERBLOCK_OFFSET, 0x200);
        if (rs == NULL)