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
b=19720
[fs/lustre-release.git]
/
lustre
/
liblustre
/
tests
/
sanity.c
diff --git
a/lustre/liblustre/tests/sanity.c
b/lustre/liblustre/tests/sanity.c
index
cb3d672
..
de17e13
100644
(file)
--- a/
lustre/liblustre/tests/sanity.c
+++ b/
lustre/liblustre/tests/sanity.c
@@
-576,7
+576,8
@@
static int check_file_size(char *file, off_t size)
return(1);
}
if (statbuf.st_size != size) {
return(1);
}
if (statbuf.st_size != size) {
- printf("size of %s: %ld != %lld\n", file, statbuf.st_size, (unsigned long long )size);
+ printf("size of %s: %lld != %lld\n", file,
+ (long long)statbuf.st_size, (long long )size);
return(-1);
}
return 0;
return(-1);
}
return 0;
@@
-611,7
+612,7
@@
int t20(char *name)
int fd;
struct iovec iov[2];
char buf[100];
int fd;
struct iovec iov[2];
char buf[100];
-
ssize_t
ret;
+
long
ret;
ENTER("trap app's general bad pointer for file i/o");
snprintf(file, MAX_PATH_LENGTH, "%s/test_t20_file", lustre_path);
ENTER("trap app's general bad pointer for file i/o");
snprintf(file, MAX_PATH_LENGTH, "%s/test_t20_file", lustre_path);
@@
-728,7
+729,7
@@
int t22(char *name)
int fd;
char *str = "1234567890";
char buf[100];
int fd;
char *str = "1234567890";
char buf[100];
-
ssize_t
ret;
+
long
ret;
ENTER("make sure O_APPEND take effect");
snprintf(file, MAX_PATH_LENGTH, "%s/test_t22_file", lustre_path);
ENTER("make sure O_APPEND take effect");
snprintf(file, MAX_PATH_LENGTH, "%s/test_t22_file", lustre_path);
@@
-1090,8
+1091,14
@@
int t52(char *name)
printf("st_atime=%s", ctime(&statbuf.st_atime));
atime = statbuf.st_atime;
for (i = 0; i < 3; i++) {
printf("st_atime=%s", ctime(&statbuf.st_atime));
atime = statbuf.st_atime;
for (i = 0; i < 3; i++) {
+ ssize_t num_read;
sleep(2);
sleep(2);
- read(fd, buf, sizeof(buf));
+ /* should not ignore read(2)'s return value */
+ num_read = read(fd, buf, sizeof(buf));
+ if (num_read < 0 ) {
+ printf("read from %s: %s\n", file, strerror(errno));
+ return -1;
+ }
stat(file, &statbuf);
printf("st_atime=%s", ctime(&statbuf.st_atime));
diff = statbuf.st_atime - atime;
stat(file, &statbuf);
printf("st_atime=%s", ctime(&statbuf.st_atime));
diff = statbuf.st_atime - atime;
@@
-1358,7
+1365,7
@@
int t56(char *name)
int fd;
size_t nbytes;
off_t basep = 0;
int fd;
size_t nbytes;
off_t basep = 0;
-
ssize_t
rc = 0;
+
long
rc = 0;
struct dirent dir;
ENTER("getdirentries should fail if nbytes is too small");
struct dirent dir;
ENTER("getdirentries should fail if nbytes is too small");