b=24037 Remove iopen patch.

[fs/lustre-release.git] / lustre / tests / createtest.c

diff --git a/lustre/tests/createtest.c b/lustre/tests/createtest.c
index 323f2ff..3795f05 100644 (file)
--- a/lustre/tests/createtest.c
+++ b/lustre/tests/createtest.c
@@ -16,8 +16,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * 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
@@ -26,7 +26,7 @@
  * 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.
  */
 /*
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
                int mode = i | 0644;
                int rc;
 
-               sprintf(name, "%s-mknod%06o", argv[1], mode);
+               sprintf(name, "%s-mknod%07o", argv[1], mode);
                rc = mknod(name, mode, 0x1234);
                switch (i) {
                case 0:
@@ -93,18 +93,27 @@ int main(int argc, char *argv[])
                                        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));
-                               exit(13);
+                               exit(14);
                        }
                        break;
                default:
                        if (rc == 0) {
                                fprintf(stderr, "%s: ERROR: %s created\n",
                                        argv[0], name);
-                               exit(14);
+                               exit(15);
                        }
                }
        }
@@ -116,7 +125,7 @@ int main(int argc, char *argv[])
                int rc;
 
                mode = i | 0644;
-               sprintf(name, "%s-creat%06o", argv[1], mode);
+               sprintf(name, "%s-creat%07o", argv[1], mode);
                fd = open(name, O_CREAT|O_RDONLY, mode);
                if (fd < 0) {
                        fprintf(stderr, "%s: ERROR creat %s: %s\n",