Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1d6e6ab
)
Make the openunlink messages consistent.
author
adilger
<adilger>
Tue, 29 Oct 2002 23:37:35 +0000
(23:37 +0000)
committer
adilger
<adilger>
Tue, 29 Oct 2002 23:37:35 +0000
(23:37 +0000)
lustre/tests/openunlink.c
patch
|
blob
|
history
diff --git
a/lustre/tests/openunlink.c
b/lustre/tests/openunlink.c
index
d0ae419
..
edb1ff9
100644
(file)
--- a/
lustre/tests/openunlink.c
+++ b/
lustre/tests/openunlink.c
@@
-2,7
+2,7
@@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <sys/types.h>
+#include <sys/types.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdlib.h>
#include <unistd.h>
@@
-15,108
+15,113
@@
int main(int argc, char **argv)
int fd, rc;
if (argc != 2) {
int fd, rc;
if (argc != 2) {
- fprintf(stderr, "usage: %s filename\n", argv[0]);
+ fprintf(stderr, "usage: %s filename\n", argv[0]);
exit(1);
exit(1);
- } else {
- fprintf(stderr, "congratulations - program starting\n");
+ } else {
+ fprintf(stderr, "congratulations - program starting\n");
}
fprintf(stderr, "opening\n");
fd = open(argv[1], O_RDWR | O_TRUNC | O_CREAT, 0644);
}
fprintf(stderr, "opening\n");
fd = open(argv[1], O_RDWR | O_TRUNC | O_CREAT, 0644);
- if (fd == -1) {
- fprintf(stderr, "open (
before) %s\n", strerror(errno));
- exit(1);
+ if (fd == -1) {
+ fprintf(stderr, "open (
normal) %s\n", strerror(errno));
+ exit(1);
}
fprintf(stderr, "writing\n");
}
fprintf(stderr, "writing\n");
- rc = write(fd, T1, strlen(T1) + 1);
- if (rc != strlen(T1) + 1) {
- fprintf(stderr, "write (
before) %s\n", strerror(errno));
- exit(1);
+ rc = write(fd, T1, strlen(T1) + 1);
+ if (rc != strlen(T1) + 1) {
+ fprintf(stderr, "write (
normal) %s\n", strerror(errno));
+ exit(1);
}
fprintf(stderr, "closing\n");
}
fprintf(stderr, "closing\n");
- rc = close(fd);
- if (rc
) {
- fprintf(stderr, "close (
before) %s\n", strerror(errno));
- exit(1);
+ rc = close(fd);
+ if (rc
) {
+ fprintf(stderr, "close (
normal) %s\n", strerror(errno));
+ exit(1);
}
fprintf(stderr, "opening again\n");
}
fprintf(stderr, "opening again\n");
- fd = open(argv[1], O_RDWR
);
- if (fd == -1) {
- fprintf(stderr, "open (
before) %s\n", strerror(errno));
- exit(1);
+ fd = open(argv[1], O_RDWR);
+ if (fd == -1) {
+ fprintf(stderr, "open (
unlink) %s\n", strerror(errno));
+ exit(1);
}
fprintf(stderr, "unlinking\n");
}
fprintf(stderr, "unlinking\n");
- rc = unlink(argv[1]);
- if (rc
) {
- fprintf(stderr, "
open %s\n", strerror(errno));
- exit(1);
+ rc = unlink(argv[1]);
+ if (rc
) {
+ fprintf(stderr, "
unlink %s\n", strerror(errno));
+ exit(1);
}
fprintf(stderr, "reading\n");
}
fprintf(stderr, "reading\n");
- rc = read(fd, buf, strlen(T1) + 1);
- if (rc != strlen(T1) + 1) {
- fprintf(stderr, "read -after %s rc %d\n", strerror(errno), rc);
- exit(1);
+ rc = read(fd, buf, strlen(T1) + 1);
+ if (rc != strlen(T1) + 1) {
+ fprintf(stderr, "read (unlink) %s rc %d\n",
+ strerror(errno), rc);
+ exit(1);
}
fprintf(stderr, "comparing data\n");
}
fprintf(stderr, "comparing data\n");
- if (memcmp(buf, T1, strlen(T1) + 1) ) {
+ if (memcmp(buf, T1, strlen(T1) + 1) ) {
fprintf(stderr, "FAILURE: read wrong data after unlink\n");
fprintf(stderr, "FAILURE: read wrong data after unlink\n");
- exit(1);
- }
+ exit(1);
+ }
fprintf(stderr, "truncating\n");
fprintf(stderr, "truncating\n");
- rc = ftruncate(fd, 0);
- if (rc )
{
- fprintf(stderr, "truncate
-after unl %s\n", strerror(errno));
- exit(1);
+ rc = ftruncate(fd, 0);
+ if (rc )
{
+ fprintf(stderr, "truncate
(unlink) %s\n", strerror(errno));
+ exit(1);
}
}
-
+
fprintf(stderr, "seeking\n");
rc = lseek(fd, 0, SEEK_SET);
fprintf(stderr, "seeking\n");
rc = lseek(fd, 0, SEEK_SET);
- if (rc != 0 ) {
- fprintf(stderr, "seek (before write) %s\n", strerror(errno));
- exit(1);
+ if (rc) {
+ fprintf(stderr, "seek (after unlink trunc) %s\n",
+ strerror(errno));
+ exit(1);
}
fprintf(stderr, "writing again\n");
}
fprintf(stderr, "writing again\n");
- rc = write(fd, T2, strlen(T2) + 1);
- if (rc != strlen(T2) + 1) {
- fprintf(stderr, "write (before) %s (rc %d)\n", strerror(errno), rc);
- exit(1);
+ rc = write(fd, T2, strlen(T2) + 1);
+ if (rc != strlen(T2) + 1) {
+ fprintf(stderr, "write (after unlink trunc) %s (rc %d)\n",
+ strerror(errno), rc);
+ exit(1);
}
fprintf(stderr, "seeking\n");
rc = lseek(fd, 0, SEEK_SET);
}
fprintf(stderr, "seeking\n");
rc = lseek(fd, 0, SEEK_SET);
- if (rc != 0 ) {
- fprintf(stderr, "seek (before read) %s\n", strerror(errno));
- exit(1);
+ if (rc) {
+ fprintf(stderr, "seek (before unlink read) %s\n",
+ strerror(errno));
+ exit(1);
}
fprintf(stderr, "reading again\n");
}
fprintf(stderr, "reading again\n");
- rc = read(fd, buf, strlen(T2) + 1);
- if (rc != strlen(T2) + 1) {
- fprintf(stderr, "read (after trunc) %s\n", strerror(errno));
- exit(1);
+ rc = read(fd, buf, strlen(T2) + 1);
+ if (rc != strlen(T2) + 1) {
+ fprintf(stderr, "read (after unlink rewrite) %s\n",
+ strerror(errno));
+ exit(1);
}
fprintf(stderr, "comparing data again\n");
}
fprintf(stderr, "comparing data again\n");
- if (memcmp(buf, T2, strlen(T2) + 1)
) {
- fprintf(stderr, "FAILURE: read wrong data after
trunc
\n");
- exit(1);
- }
+ if (memcmp(buf, T2, strlen(T2) + 1)
) {
+ fprintf(stderr, "FAILURE: read wrong data after
rewrite
\n");
+ exit(1);
+ }
fprintf(stderr, "closing again\n");
fprintf(stderr, "closing again\n");
- rc = close(fd);
- if (rc
) {
- fprintf(stderr, "close (
before) %s\n", strerror(errno));
- exit(1);
+ rc = close(fd);
+ if (rc
) {
+ fprintf(stderr, "close (
unlink) %s\n", strerror(errno));
+ exit(1);
}
}
- fprintf(stderr, "SUCCESS - goto beer\n");
- return 0;
+ fprintf(stderr, "SUCCESS - goto beer\n");
+ return 0;
}
}