chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libudev: libudev.pc add Libs.private
[elogind.git]
/
extras
/
volume_id
/
lib
/
jfs.c
diff --git
a/extras/volume_id/lib/jfs.c
b/extras/volume_id/lib/jfs.c
index b230fb258c49ad933764853b1a1ff221d45ad566..d4a5f0febb594550ad3d494a365e24e6f44d4787 100644
(file)
--- a/
extras/volume_id/lib/jfs.c
+++ b/
extras/volume_id/lib/jfs.c
@@
-24,6
+24,7
@@
#include <ctype.h>
#include "libvolume_id.h"
#include <ctype.h>
#include "libvolume_id.h"
+#include "libvolume_id-private.h"
#include "util.h"
struct jfs_super_block {
#include "util.h"
struct jfs_super_block {
@@
-41,11
+42,11
@@
struct jfs_super_block {
#define JFS_SUPERBLOCK_OFFSET 0x8000
#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;
{
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)
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_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";
volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
id->type = "jfs";