b=17661

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

diff --git a/lustre/tests/openclose.c b/lustre/tests/openclose.c
index ca10134..aa54406 100644 (file)
--- a/lustre/tests/openclose.c
+++ b/lustre/tests/openclose.c
@@ -1,9 +1,43 @@
 /* -*- 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.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * 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
+ * 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.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 /* for O_DIRECT */
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -16,7 +50,11 @@
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 
-#include <linux/lustre_user.h>
+#include <libcfs/libcfs.h>
+#include <lustre/lustre_user.h>
+#ifndef O_DIRECT
+#define O_DIRECT 0
+#endif
 
 int main(int argc, char *argv[])
 {
@@ -65,10 +103,10 @@ int main(int argc, char *argv[])
                                 continue;
 
                         if (ret < 0) {
-                                fprintf(stderr, "error: %s: wait - %s\n",
-                                        argv[0], strerror(errno));
                                 if (!rc)
                                         rc = errno;
+                                fprintf(stderr, "error: %s: wait - %s\n",
+                                        argv[0], strerror(rc));
                         } else {
                                 /*
                                  * This is a hack.  We _should_ be able to use
@@ -94,43 +132,42 @@ int main(int argc, char *argv[])
 
                 fd = open(filename, O_RDWR|O_CREAT, 0644);
                 if (fd < 0) {
+                        rc = errno;
                         fprintf(stderr, "open(%s, O_CREAT): %s\n", filename,
-                                strerror(errno));
-                        exit(errno);
+                                strerror(rc));
+                        exit(rc);
                 }
                 if (close(fd) < 0) {
-                        fprintf(stderr, "close(): %s\n", strerror(errno));
                         rc = errno;
+                        fprintf(stderr, "close(): %s\n", strerror(rc));
                         goto unlink;
                 }
 
                 for (i = 0; i < count; i++) {
                         fd = open(filename, O_RDWR|O_LARGEFILE|O_DIRECT);
                         if (fd < 0) {
-                                fprintf(stderr, "open(%s, O_RDWR): %s\n",
-                                        filename, strerror(errno));
                                 rc = errno;
+                                fprintf(stderr, "open(%s, O_RDWR): %s\n",
+                                        filename, strerror(rc));
                                 break;
                         }
                         if (ioctl(fd, LL_IOC_SETFLAGS, &ioctl_flags) < 0 &&
                             errno != ENOTTY) {
-                                fprintf(stderr, "ioctl(): %s\n",
-                                        strerror(errno));
                                 rc = errno;
+                                fprintf(stderr, "ioctl(): %s\n", strerror(rc));
                                 break;
                         }
                         if (close(fd) < 0) {
-                                fprintf(stderr, "close(): %s\n",
-                                        strerror(errno));
                                 rc = errno;
+                                fprintf(stderr, "close(): %s\n", strerror(rc));
                                 break;
                         }
                 }
         unlink:
                 if (unlink(filename) < 0) {
-                        fprintf(stderr, "unlink(%s): %s\n", filename,
-                                strerror(errno));
                         rc = errno;
+                        fprintf(stderr, "unlink(%s): %s\n", filename,
+                                strerror(rc));
                 }
                 if (threads)
                         printf("Thread %d done: rc = %d\n", thread, rc);