chiark / gitweb /
vol_id: make the --offset= argument optional
[elogind.git] / extras / volume_id / lib / ocfs.c
index bf311415dddc4431155a691001a8e00c2998f2cf..ec81f5e8e30d2adaf1d0bbfc37c2086f57c4ed36 100644 (file)
@@ -126,13 +126,13 @@ struct ocfs2_super_block {
        uint8_t         s_uuid[16];
 } PACKED;
 
-int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off)
+int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off, uint64_t size)
 {
        const uint8_t *buf;
        struct ocfs1_super_block_header *osh;
        struct ocfs1_super_block_label *osl;
 
-       info("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx\n", (unsigned long long) off);
 
        buf = volume_id_get_buffer(id, off, 0x200);
        if (buf == NULL)
@@ -144,7 +144,7 @@ int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off)
        snprintf(id->type_version, sizeof(id->type_version)-1,
                 "%u.%u", osh->major_version, osh->minor_version);
 
-       dbg("found OracleCFS signature, now reading label");
+       dbg("found OracleCFS signature, now reading label\n");
        buf = volume_id_get_buffer(id, off + 0x200, 0x200);
        if (buf == NULL)
                return -1;
@@ -156,7 +156,7 @@ int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off)
                volume_id_set_label_string(id, osl->label, 64);
        }
        if (osl->vol_id_len == 16)
-               volume_id_set_uuid(id, osl->vol_id, UUID_DCE);
+               volume_id_set_uuid(id, osl->vol_id, 0, UUID_DCE);
        id->type = "ocfs";
        return 0;
 }
@@ -164,13 +164,13 @@ int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off)
 #define OCFS2_MAX_BLOCKSIZE            0x1000
 #define OCFS2_SUPER_BLOCK_BLKNO                2
 
-int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off)
+int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off, uint64_t size)
 {
        const uint8_t *buf;
        struct ocfs2_super_block *os;
        size_t blksize;
 
-       info("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx\n", (unsigned long long) off);
 
        for (blksize = 0x200; blksize <= OCFS2_MAX_BLOCKSIZE; blksize <<= 1) {
                buf = volume_id_get_buffer(id, off + OCFS2_SUPER_BLOCK_BLKNO * blksize, 0x200);
@@ -184,7 +184,7 @@ int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off)
                volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
                volume_id_set_label_raw(id, os->s_label, 64);
                volume_id_set_label_string(id, os->s_label, 64);
-               volume_id_set_uuid(id, os->s_uuid, UUID_DCE);
+               volume_id_set_uuid(id, os->s_uuid, 0, UUID_DCE);
                snprintf(id->type_version, sizeof(id->type_version)-1,
                         "%u.%u", os->s_major_rev_level, os->s_minor_rev_level);
                id->type = "ocfs2";