X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=extras%2Fvolume_id%2Flib%2Fjfs.c;h=d4a5f0febb594550ad3d494a365e24e6f44d4787;hb=1893cf588f3d428a35a46030deca4ea54be71320;hp=b230fb258c49ad933764853b1a1ff221d45ad566;hpb=83cc6ab4760817509f1ed1ee429669e563f82caf;p=elogind.git diff --git a/extras/volume_id/lib/jfs.c b/extras/volume_id/lib/jfs.c index b230fb258..d4a5f0feb 100644 --- a/extras/volume_id/lib/jfs.c +++ b/extras/volume_id/lib/jfs.c @@ -24,6 +24,7 @@ #include #include "libvolume_id.h" +#include "libvolume_id-private.h" #include "util.h" struct jfs_super_block { @@ -41,11 +42,11 @@ struct jfs_super_block { #define JFS_SUPERBLOCK_OFFSET 0x8000 -int volume_id_probe_jfs(struct volume_id *id, uint64_t off) +int volume_id_probe_jfs(struct volume_id *id, uint64_t off, uint64_t size) { struct jfs_super_block *js; - dbg("probing at offset 0x%llx", (unsigned long long) off); + info("probing at offset 0x%llx\n", (unsigned long long) off); js = (struct jfs_super_block *) volume_id_get_buffer(id, off + JFS_SUPERBLOCK_OFFSET, 0x200); if (js == NULL) @@ -56,7 +57,7 @@ int volume_id_probe_jfs(struct volume_id *id, uint64_t off) volume_id_set_label_raw(id, js->label, 16); volume_id_set_label_string(id, js->label, 16); - volume_id_set_uuid(id, js->uuid, UUID_DCE); + volume_id_set_uuid(id, js->uuid, 0, UUID_DCE); volume_id_set_usage(id, VOLUME_ID_FILESYSTEM); id->type = "jfs";