LU-357 racer test cleanup

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

diff --git a/lustre/tests/openfile.c b/lustre/tests/openfile.c
index 821363a..61ca15f 100644 (file)
--- a/lustre/tests/openfile.c
+++ b/lustre/tests/openfile.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.
  */
 /*
@@ -51,6 +51,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <libcfs/libcfs.h>
 #include <lustre/lustre_user.h>
 
 typedef struct flag_mapping {
@@ -92,13 +93,13 @@ int main(int argc, char** argv)
         int    fd;
         int    flags = 0;
         mode_t mode = 0644;
-        char*  fname = NULL;
+        char  *fname = NULL;
         int    mode_set = 0;
         int    flag_set = 0;
         int    c;
         int    save_errno = 0;
         int    print_usage = 0;
-        char*  cloned_flags = NULL;
+        char  *cloned_flags = NULL;
 
         if (argc == 1)
                 Usage_and_abort();
@@ -125,7 +126,7 @@ int main(int argc, char** argv)
                                 break;
                         } else 
                                 flags = 0;
-                        
+
                         for (tmp = strtok(cloned_flags, ":|"); tmp;
                              tmp = strtok(NULL, ":|")) {
                                 int i = 0;
@@ -202,12 +203,11 @@ int main(int argc, char** argv)
         } else {
                 fprintf(stderr, "Error in opening file \"%s\"(flags=%s",
                         fname, cloned_flags);
+                if (mode_set)
+                        fprintf(stderr, ", mode=%o", mode);
+                fprintf(stderr, ") %d: %s\n", save_errno, strerror(save_errno));
         }
 
-        if (mode_set)
-                fprintf(stderr, ", mode=%o", mode);
-        fprintf(stderr, ") %d: %s\n", save_errno, strerror(save_errno));
-
 out:
         if (cloned_flags)
                 free(cloned_flags);
@@ -216,4 +216,3 @@ out:
 
         return save_errno;
 }
-