chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] udev_volume_id: volume_id version 034
[elogind.git]
/
extras
/
volume_id
/
volume_id
/
jfs
/
jfs.c
diff --git
a/extras/volume_id/volume_id/jfs/jfs.c
b/extras/volume_id/volume_id/jfs/jfs.c
index c9dce84ecb80c6ab19c48889dc721261783316c9..ab0b83081c4259f8b8169dc352e1460c82b432b8 100644
(file)
--- 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"
#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)
{
#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)
js = (struct jfs_super_block *) volume_id_get_buffer(id, off + JFS_SUPERBLOCK_OFFSET, 0x200);
if (js == NULL)