X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Fvolume_id%2Fjfs%2Fjfs.c;h=ab0b83081c4259f8b8169dc352e1460c82b432b8;hp=c9dce84ecb80c6ab19c48889dc721261783316c9;hb=9d4791b66a7756421fc699be51a7be68a5aed329;hpb=e39515ac1fd303c0263ee4bc91f2d7699617d0bf diff --git a/extras/volume_id/volume_id/jfs/jfs.c b/extras/volume_id/volume_id/jfs/jfs.c index c9dce84ec..ab0b83081 100644 --- a/extras/volume_id/volume_id/jfs/jfs.c +++ b/extras/volume_id/volume_id/jfs/jfs.c @@ -39,22 +39,26 @@ #include "../util.h" #include "jfs.h" +struct jfs_super_block { + __u8 magic[4]; + __u32 version; + __u64 size; + __u32 bsize; + __u32 dummy1; + __u32 pbsize; + __u32 dummy2[27]; + __u8 uuid[16]; + __u8 label[16]; + __u8 loguuid[16]; +} __attribute__((__packed__)); + #define JFS_SUPERBLOCK_OFFSET 0x8000 int volume_id_probe_jfs(struct volume_id *id, __u64 off) { - struct jfs_super_block { - __u8 magic[4]; - __u32 version; - __u64 size; - __u32 bsize; - __u32 dummy1; - __u32 pbsize; - __u32 dummy2[27]; - __u8 uuid[16]; - __u8 label[16]; - __u8 loguuid[16]; - } __attribute__((__packed__)) *js; + struct jfs_super_block *js; + + dbg("probing at offset %llu", off); js = (struct jfs_super_block *) volume_id_get_buffer(id, off + JFS_SUPERBLOCK_OFFSET, 0x200); if (js == NULL)