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-6609 test: wait for import state FULL
[fs/lustre-release.git]
/
lustre
/
tests
/
createtest.c
diff --git
a/lustre/tests/createtest.c
b/lustre/tests/createtest.c
index
6f7ec0d
..
17008a8
100644
(file)
--- a/
lustre/tests/createtest.c
+++ b/
lustre/tests/createtest.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.
@@
-17,16
+15,12
@@
*
* 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
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-67,7
+61,7
@@
int main(int argc, char *argv[])
int mode = i | 0644;
int rc;
int mode = i | 0644;
int rc;
- s
printf(name, "%s-mknod%06
o", argv[1], mode);
+ s
nprintf(name, sizeof(name), "%s-mknod%07
o", argv[1], mode);
rc = mknod(name, mode, 0x1234);
switch (i) {
case 0:
rc = mknod(name, mode, 0x1234);
switch (i) {
case 0:
@@
-93,18
+87,27
@@
int main(int argc, char *argv[])
argv[0], name, st.st_mode, mode);
exit(12);
}
argv[0], name, st.st_mode, mode);
exit(12);
}
+ if (i == S_IFCHR || i == S_IFBLK) {
+ if (st.st_rdev != 0x1234) {
+ fprintf(stderr, "%s: ERROR rdev %s: "
+ "%llu != 0x1234",
+ argv[0], name,
+ (unsigned long long)st.st_rdev);
+ exit(13);
+ }
+ }
rc = unlink(name);
if (rc < 0) {
fprintf(stderr, "%s: ERROR unlink %s: %s",
argv[0], name, strerror(errno));
rc = unlink(name);
if (rc < 0) {
fprintf(stderr, "%s: ERROR unlink %s: %s",
argv[0], name, strerror(errno));
- exit(1
3
);
+ exit(1
4
);
}
break;
default:
if (rc == 0) {
fprintf(stderr, "%s: ERROR: %s created\n",
argv[0], name);
}
break;
default:
if (rc == 0) {
fprintf(stderr, "%s: ERROR: %s created\n",
argv[0], name);
- exit(1
4
);
+ exit(1
5
);
}
}
}
}
}
}
@@
-116,7
+119,7
@@
int main(int argc, char *argv[])
int rc;
mode = i | 0644;
int rc;
mode = i | 0644;
- s
printf(name, "%s-creat%06
o", argv[1], mode);
+ s
nprintf(name, sizeof(name), "%s-creat%07
o", argv[1], mode);
fd = open(name, O_CREAT|O_RDONLY, mode);
if (fd < 0) {
fprintf(stderr, "%s: ERROR creat %s: %s\n",
fd = open(name, O_CREAT|O_RDONLY, mode);
if (fd < 0) {
fprintf(stderr, "%s: ERROR creat %s: %s\n",
@@
-147,7
+150,7
@@
int main(int argc, char *argv[])
struct stat st;
int rc;
struct stat st;
int rc;
- s
printf(name
, "%s-mkdir%06o", argv[1], i | 0644);
+ s
nprintf(name, sizeof(name)
, "%s-mkdir%06o", argv[1], i | 0644);
rc = mkdir(name, i | 0664);
if (rc < 0) {
fprintf(stderr, "%s: ERROR mkdir %s: %s\n",
rc = mkdir(name, i | 0664);
if (rc < 0) {
fprintf(stderr, "%s: ERROR mkdir %s: %s\n",