chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix GGC signed pointer warnings and switch volume_id to stdint
[elogind.git]
/
extras
/
volume_id
/
volume_id
/
lsi_raid.c
diff --git
a/extras/volume_id/volume_id/lsi_raid.c
b/extras/volume_id/volume_id/lsi_raid.c
index e411fbc2644f6c774957a7f5ab1f51c732f2dc6a..bb2ac7f9c5c363e8af0d4fa434c5d43716457b53 100644
(file)
--- a/
extras/volume_id/volume_id/lsi_raid.c
+++ b/
extras/volume_id/volume_id/lsi_raid.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"
@@
-40,15
+39,15
@@
#include "lsi_raid.h"
struct lsi_meta {
#include "lsi_raid.h"
struct lsi_meta {
-
__u8
sig[6];
+
uint8_t
sig[6];
} __attribute__((packed));
#define LSI_SIGNATURE "$XIDE$"
} __attribute__((packed));
#define LSI_SIGNATURE "$XIDE$"
-int volume_id_probe_lsi_mega_raid(struct volume_id *id,
__u64 off, __u64
size)
+int volume_id_probe_lsi_mega_raid(struct volume_id *id,
uint64_t off, uint64_t
size)
{
{
- const
__u8
*buf;
-
__u64
meta_off;
+ const
uint8_t
*buf;
+
uint64_t
meta_off;
struct lsi_meta *lsi;
dbg("probing at offset 0x%llx, size 0x%llx",
struct lsi_meta *lsi;
dbg("probing at offset 0x%llx, size 0x%llx",