X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Focfs.c;h=e7bf55c4212f32b0bf2b69b66371a1940e3066b0;hb=ec2dd02e2a2748134f9c8347e12b802b42dea6b5;hp=bf311415dddc4431155a691001a8e00c2998f2cf;hpb=f7dd3a57a40282f1c3fb9ad90a30d58b31b64ff8;p=elogind.git

diff --git a/extras/volume_id/lib/ocfs.c b/extras/volume_id/lib/ocfs.c
index bf311415d..e7bf55c42 100644
--- a/extras/volume_id/lib/ocfs.c
+++ b/extras/volume_id/lib/ocfs.c
@@ -4,19 +4,24 @@
  * Copyright (C) 2004 Andre Masella <andre@masella.no-ip.org>
  * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
  *
- *	This program is free software; you can redistribute it and/or modify it
- *	under the terms of the GNU General Public License as published by the
- *	Free Software Foundation version 2 of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -25,8 +30,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
-#include "util.h"
-
+#include "libvolume_id-private.h"
 
 struct ocfs1_super_block_header {
 	uint32_t	minor_version;
@@ -126,13 +130,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%" PRIx64 "\n", off);
 
 	buf = volume_id_get_buffer(id, off, 0x200);
 	if (buf == NULL)
@@ -144,7 +148,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 +160,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 +168,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%" PRIx64 "\n", 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 +188,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";