chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevadm: add --version --help options to man page, hide them as commands
[elogind.git]
/
extras
/
volume_id
/
lib
/
reiserfs.c
diff --git
a/extras/volume_id/lib/reiserfs.c
b/extras/volume_id/lib/reiserfs.c
index abeb06b88f6f0f6245c81a929cede20e4345d17e..188607b7c1c04a32342bf8dfa811711cdfc0213a 100644
(file)
--- a/
extras/volume_id/lib/reiserfs.c
+++ b/
extras/volume_id/lib/reiserfs.c
@@
-25,6
+25,7
@@
#include <ctype.h>
#include "libvolume_id.h"
#include <ctype.h>
#include "libvolume_id.h"
+#include "libvolume_id-private.h"
#include "util.h"
struct reiserfs_super_block {
#include "util.h"
struct reiserfs_super_block {
@@
-54,19
+55,19
@@
struct reiser4_super_block {
#define REISERFS1_SUPERBLOCK_OFFSET 0x2000
#define REISERFS_SUPERBLOCK_OFFSET 0x10000
#define REISERFS1_SUPERBLOCK_OFFSET 0x2000
#define REISERFS_SUPERBLOCK_OFFSET 0x10000
-int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off)
+int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off
, uint64_t size
)
{
struct reiserfs_super_block *rs;
struct reiser4_super_block *rs4;
uint8_t *buf;
{
struct reiserfs_super_block *rs;
struct reiser4_super_block *rs4;
uint8_t *buf;
- 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 + REISERFS_SUPERBLOCK_OFFSET, 0x200);
if (buf == NULL)
return -1;
buf = volume_id_get_buffer(id, off + REISERFS_SUPERBLOCK_OFFSET, 0x200);
if (buf == NULL)
return -1;
- rs = (struct reiserfs_super_block *) buf;
;
+ rs = (struct reiserfs_super_block *) buf;
if (memcmp(rs->magic, "ReIsErFs", 8) == 0) {
strcpy(id->type_version, "3.5");
id->type = "reiserfs";
if (memcmp(rs->magic, "ReIsErFs", 8) == 0) {
strcpy(id->type_version, "3.5");
id->type = "reiserfs";
@@
-88,7
+89,7
@@
int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off)
strcpy(id->type_version, "4");
volume_id_set_label_raw(id, rs4->label, 16);
volume_id_set_label_string(id, rs4->label, 16);
strcpy(id->type_version, "4");
volume_id_set_label_raw(id, rs4->label, 16);
volume_id_set_label_string(id, rs4->label, 16);
- volume_id_set_uuid(id, rs4->uuid, UUID_DCE);
+ volume_id_set_uuid(id, rs4->uuid,
0,
UUID_DCE);
id->type = "reiser4";
goto found;
}
id->type = "reiser4";
goto found;
}
@@
-109,7
+110,7
@@
int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off)
found_label:
volume_id_set_label_raw(id, rs->label, 16);
volume_id_set_label_string(id, rs->label, 16);
found_label:
volume_id_set_label_raw(id, rs->label, 16);
volume_id_set_label_string(id, rs->label, 16);
- volume_id_set_uuid(id, rs->uuid, UUID_DCE);
+ volume_id_set_uuid(id, rs->uuid,
0,
UUID_DCE);
found:
volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
found:
volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);