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-12043 llite: make sure readahead cover current read
[fs/lustre-release.git]
/
lustre
/
tests
/
test_brw.c
diff --git
a/lustre/tests/test_brw.c
b/lustre/tests/test_brw.c
index
d0773e9
..
27a5648
100644
(file)
--- a/
lustre/tests/test_brw.c
+++ b/
lustre/tests/test_brw.c
@@
-15,11
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* 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
*/
*
* GPL HEADER END
*/
@@
-39,6
+35,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>
@@
-50,17
+47,14
@@
#include <sys/stat.h>
#include <linux/types.h>
#include <sys/stat.h>
#include <linux/types.h>
-#include <libcfs/types.h>
-#include <libcfs/byteorder.h>
-
#define READ 1
#define WRITE 2
#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 = hto
le64(off);
+
id = hto
le64(id);
memcpy(addr, (char *)&off, LPDS);
memcpy(addr + LPDS, (char *)&id, LPDS);
memcpy(addr, (char *)&off, LPDS);
memcpy(addr + LPDS, (char *)&id, LPDS);
@@
-71,33
+65,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;
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)) {
if (memcmp(addr, (char *)&ne_off, LPDS)) {
- fprintf(stderr, "%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)) {
- fprintf(stderr, "%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)) {
- fprintf(stderr, "%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)) {
- fprintf(stderr, "%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,9
+111,9
@@
int main(int argc, char **argv)
{
int fd;
char *buf;
{
int fd;
char *buf;
-
long long count, last, offse
t;
+
long long count, las
t;
long pg_vec, len;
long pg_vec, len;
-
__u64 objid
;
+
uint64_t objid, offset
;
struct stat st;
int flags = 0;
int cmd = 0;
struct stat st;
int flags = 0;
int cmd = 0;
@@
-188,7
+182,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",
@@
-222,10
+216,10
@@
int main(int argc, char **argv)
}
for (offset = 0; offset < last && cmd & WRITE; offset += len) {
}
for (offset = 0; offset < last && cmd & WRITE; offset += len) {
- int i;
+
unsigned
int i;
for (i = 0; i < len; i += st.st_blksize)
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);
offset + i, objid);
rc = write(fd, buf, len);