X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Focfs.c;h=9f251f1794610940cc6d061910bcfd7e459f31e9;hp=b376ead8330d50380ecad57dc8a0df595842aed0;hb=444f07fea49bc40207df5e7910907492529b9bce;hpb=83cc6ab4760817509f1ed1ee429669e563f82caf

diff --git a/extras/volume_id/lib/ocfs.c b/extras/volume_id/lib/ocfs.c
index b376ead83..9f251f179 100644
--- a/extras/volume_id/lib/ocfs.c
+++ b/extras/volume_id/lib/ocfs.c
@@ -126,12 +126,14 @@ 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);
+
 	buf = volume_id_get_buffer(id, off, 0x200);
 	if (buf == NULL)
 		return -1;
@@ -154,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;
 }
@@ -162,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;
 
-	dbg("probing at offset 0x%llx", (unsigned long long) off);
+	info("probing at offset 0x%llx", (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);
@@ -182,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";