add "Persistent Device Naming" rules file for disks

[elogind.git] / extras / volume_id / volume_id / xfs.c

diff --git a/extras/volume_id/volume_id/xfs.c b/extras/volume_id/volume_id/xfs.c
index 12a89aafcb207c8ec7f3689d8ae2266a3dca1e95..e631e23ead623dd1eb7fb7fba32261cf76bf5f43 100644 (file)
--- a/extras/volume_id/volume_id/xfs.c
+++ b/extras/volume_id/volume_id/xfs.c
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"
@@ -40,25 +39,25 @@
 #include "xfs.h"
 
 struct xfs_super_block {
-       __u8    magic[4];
-       __u32   blocksize;
-       __u64   dblocks;
-       __u64   rblocks;
-       __u32   dummy1[2];
-       __u8    uuid[16];
-       __u32   dummy2[15];
-       __u8    fname[12];
-       __u32   dummy3[2];
-       __u64   icount;
-       __u64   ifree;
-       __u64   fdblocks;
+       uint8_t magic[4];
+       uint32_t        blocksize;
+       uint64_t        dblocks;
+       uint64_t        rblocks;
+       uint32_t        dummy1[2];
+       uint8_t uuid[16];
+       uint32_t        dummy2[15];
+       uint8_t fname[12];
+       uint32_t        dummy3[2];
+       uint64_t        icount;
+       uint64_t        ifree;
+       uint64_t        fdblocks;
 } __attribute__((__packed__));
 
-int volume_id_probe_xfs(struct volume_id *id, __u64 off)
+int volume_id_probe_xfs(struct volume_id *id, uint64_t off)
 {
        struct xfs_super_block *xs;
 
-       dbg("probing at offset %llu", off);
+       dbg("probing at offset 0x%llx", (unsigned long long) off);
 
        xs = (struct xfs_super_block *) volume_id_get_buffer(id, off, 0x200);
        if (xs == NULL)