For the patchless client, LNET needs to come from it's own branch too.

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

diff --git a/lustre/tests/createmany.c b/lustre/tests/createmany.c
index f426488..1e6ff1f 100644 (file)
--- a/lustre/tests/createmany.c
+++ b/lustre/tests/createmany.c
@@ -14,15 +14,15 @@
 
 void usage(char *prog)
 {
-        printf("usage: %s {-o|-m|-l<tgt>} filenamefmt count\n", prog);
-        printf("       %s {-o|-m|-l<tgt>} filenamefmt -seconds\n", prog);
-        printf("       %s {-o|-m|-l<tgt>} filenamefmt start count\n", prog);
+        printf("usage: %s {-o|-m|-d|-l<tgt>} filenamefmt count\n", prog);
+        printf("       %s {-o|-m|-d|-l<tgt>} filenamefmt -seconds\n", prog);
+        printf("       %s {-o|-m|-d|-l<tgt>} filenamefmt start count\n", prog);
 }
 
 int main(int argc, char ** argv)
 {
-        int i, rc = 0, do_open = 0, do_link = 0;
-        char format[4096], *fmt, *tgt;
+        int i, rc = 0, do_open = 0, do_link = 0, do_mkdir = 0;
+        char format[4096], *fmt, *tgt = NULL;
         char filename[4096];
         long start, last, end;
         long begin = 0, count;
@@ -32,7 +32,9 @@ int main(int argc, char ** argv)
                 return 1;
         }
 
-        if (strcmp(argv[1], "-o") == 0) {
+        if (strcmp(argv[1], "-d") == 0) {
+                do_mkdir = 1;
+        } else if (strcmp(argv[1], "-o") == 0) {
                 do_open = 1;
         } else if (strncmp(argv[1], "-l", 2) == 0 && argv[1][2]) {
                 tgt = argv[1] + 2;
@@ -73,7 +75,7 @@ int main(int argc, char ** argv)
         for (i = 0; i < count && time(0) < end; i++, begin++) {
                 sprintf(filename, fmt, begin);
                 if (do_open) {
-                        int fd = open(filename, O_CREAT|O_RDWR, 0644);
+                        int fd = open(filename, O_CREAT | O_RDWR, 0644);
                         if (fd < 0) {
                                 printf("open(%s) error: %s\n", filename,
                                        strerror(errno));
@@ -81,16 +83,24 @@ int main(int argc, char ** argv)
                                 break;
                         }
                         close(fd);
-               } else if (do_link) {
+                } else if (do_link) {
                         rc = link(tgt, filename);
                         if (rc) {
                                 printf("link(%s, %s) error: %s\n",
-                                      tgt, filename, strerror(errno));
+                                       tgt, filename, strerror(errno));
+                                rc = errno;
+                                break;
+                        }
+               } else if (do_mkdir) {
+                        rc = mkdir(filename, 0755);
+                        if (rc) {
+                                printf("mkdir(%s) error: %s\n",
+                                       filename, strerror(errno));
                                 rc = errno;
                                 break;
                         }
                 } else {
-                        rc = mknod(filename, S_IFREG| 0444, 0);
+                        rc = mknod(filename, S_IFREG | 0444, 0);
                         if (rc) {
                                 printf("mknod(%s) error: %s\n",
                                        filename, strerror(errno));