Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-8178 lproc: fix negative recovery_duration
[fs/lustre-release.git]
/
lustre
/
tests
/
test_brw.c
diff --git
a/lustre/tests/test_brw.c
b/lustre/tests/test_brw.c
index
77e3594
..
9d7dacb
100644
(file)
--- 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.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-16,8
+14,8
@@
* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
[sun.com URL with a
- *
copy of GPLv2].
+ * 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
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
@@
-26,8
+24,10
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-39,6
+39,7
@@
#define _GNU_SOURCE
#endif
#define _GNU_SOURCE
#endif
+#include <inttypes.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
@@
-48,8
+49,9
@@
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <linux/types.h>
-#include <lib
lustre
.h>
+#include <lib
cfs/byteorder
.h>
#define READ 1
#define WRITE 2
#define READ 1
#define WRITE 2
@@
-69,33
+71,33
@@
int block_debug_setup(void *addr, int len, __u64 off, __u64 id)
return 0;
}
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);
if (memcmp(addr, (char *)&ne_off, LPDS)) {
int err = 0;
ne_off = le64_to_cpu(off);
id = le64_to_cpu(id);
if (memcmp(addr, (char *)&ne_off, LPDS)) {
-
CERROR("%s: for offset "LPU64" off: "LPX64" != "LPX
64"\n",
- who, off, *(
__u64
*)addr, ne_off);
+
fprintf(stderr, "%s: for offset %"PRIu64" off: %"PRIx64" != %"PRIx
64"\n",
+ who, off, *(
uint64_t
*)addr, ne_off);
err = -EINVAL;
}
if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
err = -EINVAL;
}
if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
-
CERROR("%s: for offset "LPU64" id: "LPX64" != "LPX
64"\n",
- who, off, *(
__u64
*)(addr + LPDS), id);
+
fprintf(stderr, "%s: for offset %"PRIu64" id: %"PRIx64" != %"PRIx
64"\n",
+ who, off, *(
uint64_t
*)(addr + LPDS), id);
err = -EINVAL;
}
addr += size - LPDS - LPDS;
if (memcmp(addr, (char *)&ne_off, LPDS)) {
err = -EINVAL;
}
addr += size - LPDS - LPDS;
if (memcmp(addr, (char *)&ne_off, LPDS)) {
-
CERROR("%s: for offset "LPU64" end off: "LPX64" != "LPX
64"\n",
- who, off, *(
__u64
*)addr, ne_off);
+
fprintf(stderr, "%s: for offset %"PRIu64" end off: %"PRIx64" != %"PRIx
64"\n",
+ who, off, *(
uint64_t
*)addr, ne_off);
err = -EINVAL;
}
if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
err = -EINVAL;
}
if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
-
CERROR("%s: for offset "LPU64" end id: "LPX64" != "LPX
64"\n",
- who, off, *(
__u64
*)(addr + LPDS), id);
+
fprintf(stderr, "%s: for offset %"PRIu64" end id: %"PRIx64" != %"PRIx
64"\n",
+ who, off, *(
uint64_t
*)(addr + LPDS), id);
err = -EINVAL;
}
err = -EINVAL;
}
@@
-117,7
+119,7
@@
int main(int argc, char **argv)
char *buf;
long long count, last, offset;
long pg_vec, len;
char *buf;
long long count, last, offset;
long pg_vec, len;
-
__u64
objid;
+
uint64_t
objid;
struct stat st;
int flags = 0;
int cmd = 0;
struct stat st;
int flags = 0;
int cmd = 0;
@@
-186,7
+188,7
@@
int main(int argc, char **argv)
objid = 3;
}
objid = 3;
}
-
printf("%s: %s on %s(objid "LPX
64") for %llux%ld pages \n",
+
printf("%s: %s on %s(objid %"PRIx
64") for %llux%ld pages \n",
argv[0],
#ifdef O_DIRECT
flags & O_DIRECT ? "directio" : "i/o",
argv[0],
#ifdef O_DIRECT
flags & O_DIRECT ? "directio" : "i/o",