* 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>
#include <ctype.h>
#include "libvolume_id.h"
-#include "util.h"
-
+#include "libvolume_id-private.h"
struct ocfs1_super_block_header {
uint32_t minor_version;
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)
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;
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;
}
#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);
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";