#define _GNU_SOURCE
#endif
+#include <inttypes.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
#include <linux/types.h>
-#include <libcfs/types.h>
-#include <libcfs/byteorder.h>
-
#define READ 1
#define WRITE 2
-#define LPDS sizeof(__u64)
-int block_debug_setup(void *addr, int len, __u64 off, __u64 id)
+#define LPDS sizeof(uint64_t)
+int block_debug_setup(void *addr, int len, uint64_t off, uint64_t id)
{
- off = cpu_to_le64(off);
- id = cpu_to_le64(id);
+ off = htole64(off);
+ id = htole64(id);
memcpy(addr, (char *)&off, LPDS);
memcpy(addr + LPDS, (char *)&id, LPDS);
return 0;
}
-int block_debug_check(char *who, void *addr, int size, __u64 off, __u64 id)
+int block_debug_check(char *who, void *addr, int size, uint64_t off, uint64_t id)
{
- __u64 ne_off;
+ uint64_t ne_off;
int err = 0;
- ne_off = le64_to_cpu(off);
- id = le64_to_cpu(id);
+ ne_off = le64toh(off);
+ id = le64toh(id);
if (memcmp(addr, (char *)&ne_off, LPDS)) {
- fprintf(stderr, "%s: for offset "LPU64" off: "LPX64" != "LPX64"\n",
- who, off, *(__u64 *)addr, ne_off);
+ fprintf(stderr, "%s: for offset %"PRIu64" off: %"PRIx64" != %"PRIx64"\n",
+ who, off, *(uint64_t *)addr, ne_off);
err = -EINVAL;
}
if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
- fprintf(stderr, "%s: for offset "LPU64" id: "LPX64" != "LPX64"\n",
- who, off, *(__u64 *)(addr + LPDS), id);
+ fprintf(stderr, "%s: for offset %"PRIu64" id: %"PRIx64" != %"PRIx64"\n",
+ who, off, *(uint64_t *)(addr + LPDS), id);
err = -EINVAL;
}
addr += size - LPDS - LPDS;
if (memcmp(addr, (char *)&ne_off, LPDS)) {
- fprintf(stderr, "%s: for offset "LPU64" end off: "LPX64" != "LPX64"\n",
- who, off, *(__u64 *)addr, ne_off);
+ fprintf(stderr, "%s: for offset %"PRIu64" end off: %"PRIx64" != %"PRIx64"\n",
+ who, off, *(uint64_t *)addr, ne_off);
err = -EINVAL;
}
if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
- fprintf(stderr, "%s: for offset "LPU64" end id: "LPX64" != "LPX64"\n",
- who, off, *(__u64 *)(addr + LPDS), id);
+ fprintf(stderr, "%s: for offset %"PRIu64" end id: %"PRIx64" != %"PRIx64"\n",
+ who, off, *(uint64_t *)(addr + LPDS), id);
err = -EINVAL;
}
{
int fd;
char *buf;
- long long count, last, offset;
+ long long count, last;
long pg_vec, len;
- __u64 objid;
+ uint64_t objid, offset;
struct stat st;
int flags = 0;
int cmd = 0;
objid = 3;
}
- printf("%s: %s on %s(objid "LPX64") for %llux%ld pages \n",
+ printf("%s: %s on %s(objid %"PRIx64") for %llux%ld pages \n",
argv[0],
#ifdef O_DIRECT
flags & O_DIRECT ? "directio" : "i/o",
}
for (offset = 0; offset < last && cmd & WRITE; offset += len) {
- int i;
+ unsigned int i;
for (i = 0; i < len; i += st.st_blksize)
- block_debug_setup(buf + i, st.st_blksize,
+ block_debug_setup(buf + i, st.st_blksize,
offset + i, objid);
rc = write(fd, buf, len);