X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Ftest_brw.c;h=27a56485dda92f2fa76704a509f5594dc9765013;hb=8d1639b5cf1edbc885876956dcd6189173c00955;hp=e0b39932af172870d3be76c2121cd10a5137e834;hpb=0f8dca08a4f68cba82c2c822998ecc309d3b7aaf;p=fs%2Flustre-release.git

diff --git a/lustre/tests/test_brw.c b/lustre/tests/test_brw.c
index e0b3993..27a5648 100644
--- a/lustre/tests/test_brw.c
+++ b/lustre/tests/test_brw.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -17,17 +15,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,6 +35,7 @@
 #define _GNU_SOURCE
 #endif
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -48,17 +45,16 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-
-#include <liblustre.h>
+#include <linux/types.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);
 
@@ -69,33 +65,33 @@ int block_debug_setup(void *addr, int len, __u64 off, __u64 id)
         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)) {
-                CERROR("%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)) {
-                CERROR("%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)) {
-                CERROR("%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)) {
-                CERROR("%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;
         }
 
@@ -115,9 +111,9 @@ int main(int argc, char **argv)
 {
         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;
@@ -186,7 +182,7 @@ int main(int argc, char **argv)
                 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",
@@ -220,10 +216,10 @@ int main(int argc, char **argv)
         }
 
         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);