X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fmultiop.c;h=40a8cb4f64d0fa05c171a26937b3538c3a0f4add;hp=a7436ec628fc08e4cd3c63b5b74408aa7f2bcb93;hb=6c2bbc022832087f2ff0f65d83e3b0a460e45911;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850

diff --git a/lustre/tests/multiop.c b/lustre/tests/multiop.c
index a7436ec..40a8cb4 100644
--- a/lustre/tests/multiop.c
+++ b/lustre/tests/multiop.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,22 +37,23 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* pull in O_DIRECTORY in bits/fcntl.h */
 #endif
-#include <stdio.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
 #include <string.h>
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/vfs.h>
 #include <sys/ioctl.h>
+#include <sys/xattr.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <semaphore.h>
 #include <time.h>
 #include <err.h>
-#include <attr/xattr.h>
 
 #include <lustre/lustre_idl.h>
 #include <lustre/lustreapi.h>
@@ -515,12 +516,15 @@ int main(int argc, char **argv)
 			if (len <= 0)
 				len = 1;
 			if (bufsize < len) {
-				buf = realloc(buf, len + ALIGN_LEN);
-				if (buf == NULL) {
+				void *tmp;
+				tmp = realloc(buf, len + ALIGN_LEN);
+				if (tmp == NULL) {
+					free(buf);
 					save_errno = errno;
 					perror("allocating buf for read\n");
 					exit(save_errno);
 				}
+				buf = tmp;
 				bufsize = len;
 				buf_align = (char *)((long)(buf + ALIGN_LEN) &
 						     ~ALIGN_LEN);
@@ -608,12 +612,15 @@ int main(int argc, char **argv)
 			if (len <= 0)
 				len = 1;
 			if (bufsize < len) {
-				buf = realloc(buf, len + ALIGN_LEN);
-				if (buf == NULL) {
+				void *tmp;
+				tmp = realloc(buf, len + ALIGN_LEN);
+				if (tmp == NULL) {
+					free(buf);
 					save_errno = errno;
 					perror("allocating buf for write\n");
 					exit(save_errno);
 				}
+				buf = tmp;
 				bufsize = len;
 				buf_align = (char *)((long)(buf + ALIGN_LEN) &
 						     ~ALIGN_LEN);
@@ -643,7 +650,7 @@ int main(int argc, char **argv)
 					" %d\n", rc);
 				exit(-rc);
 			}
-			printf("dataversion is "LPU64"\n", dv);
+			printf("dataversion is %ju\n", (uintmax_t)dv);
 			break;
                 case 'y':
                         if (fsync(fd) == -1) {