chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add "Persistent Device Naming" rules file for disks
[elogind.git]
/
extras
/
volume_id
/
volume_id
/
hpfs.c
diff --git
a/extras/volume_id/volume_id/hpfs.c
b/extras/volume_id/volume_id/hpfs.c
index 3aa95fa8397da25a32fd4739a6611e879973d4d7..8cd65cd6e9a77de6da77edd402081cfb55429992 100644
(file)
--- a/
extras/volume_id/volume_id/hpfs.c
+++ b/
extras/volume_id/volume_id/hpfs.c
@@
-32,7
+32,6
@@
#include <string.h>
#include <errno.h>
#include <ctype.h>
#include <string.h>
#include <errno.h>
#include <ctype.h>
-#include <asm/types.h>
#include "volume_id.h"
#include "logging.h"
#include "volume_id.h"
#include "logging.h"
@@
-41,17
+40,17
@@
struct hpfs_super
{
struct hpfs_super
{
-
__u8
magic[4];
-
__u8
version;
+
uint8_t
magic[4];
+
uint8_t
version;
} __attribute__((__packed__));
#define HPFS_SUPERBLOCK_OFFSET 0x2000
} __attribute__((__packed__));
#define HPFS_SUPERBLOCK_OFFSET 0x2000
-int volume_id_probe_hpfs(struct volume_id *id,
__u64
off)
+int volume_id_probe_hpfs(struct volume_id *id,
uint64_t
off)
{
struct hpfs_super *hs;
{
struct hpfs_super *hs;
- dbg("probing at offset
%llu",
off);
+ dbg("probing at offset
0x%llx", (unsigned long long)
off);
hs = (struct hpfs_super *) volume_id_get_buffer(id, off + HPFS_SUPERBLOCK_OFFSET, 0x200);
if (hs == NULL)
hs = (struct hpfs_super *) volume_id_get_buffer(id, off + HPFS_SUPERBLOCK_OFFSET, 0x200);
if (hs == NULL)