LU-3068 build: fix 'incorrect expression' errors

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

diff --git a/lustre/tests/openunlink.c b/lustre/tests/openunlink.c
index 96632a9..c471e3b 100644 (file)
--- a/lustre/tests/openunlink.c
+++ b/lustre/tests/openunlink.c
@@ -1,3 +1,37 @@
+/*
+ * 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 (c) 2002, 2010, Oracle and/or its affiliates. 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.
+ */
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <string.h>
@@ -44,49 +78,37 @@ int main(int argc, char **argv)
         }
 
         if (argc == 3) {
-                fprintf(stderr, "closing %s\n", fname);
-                rc = close(fd);
-                if (rc) {
-                        fprintf(stderr, "close (normal) %s\n", strerror(errno));
-                        exit(1);
-                }
-
-                fprintf(stderr, "opening %s\n", fname2);
-                fd = open(fname2, O_RDWR);
-                if (fd == -1) {
-                        fprintf(stderr, "open (unlink) %s\n", strerror(errno));
-                        exit(1);
-                }
-
                 fprintf (stderr, "unlinking %s\n", fname2);
                 rc = unlink(fname2);
                 if (rc) {
                         fprintf(stderr, "unlink %s\n", strerror(errno));
                         exit(1);
                 }
-
-                if (access(fname2, F_OK) == 0) {
-                        fprintf(stderr, "%s still exists\n", fname2);
-                        exit(1);
-                }
         } else {
-                fprintf(stderr, "resetting fd offset\n");
-                rc = lseek(fd, 0, SEEK_SET);
-                if (rc) {
-                        fprintf(stderr, "seek %s\n", strerror(errno));
-                        exit(1);
-                }
-
                 printf("unlink %s and press enter\n", fname);
                 getc(stdin);
         }
 
+        fprintf(stderr, "accessing (1)\n");
+       if (access(fname, F_OK) == 0) {
+               fprintf(stderr, "%s still exists\n", fname);
+               exit(1);
+       }
+
+        fprintf(stderr, "seeking (1)\n");
+        rc = lseek(fd, 0, SEEK_SET);
+        if (rc) {
+                fprintf(stderr, "seek %s\n", strerror(errno));
+                exit(1);
+        }
+
+        fprintf(stderr, "accessing (2)\n");
         if (access(fname, F_OK) == 0) {
                 fprintf(stderr, "%s still exists\n", fname);
                 exit(1);
         }
 
-        fprintf(stderr, "fstating\n");
+        fprintf(stderr, "fstat...\n");
         rc = fstat(fd, &st);
         if (rc) {
                 fprintf(stderr, "fstat (unlink) %s\n", strerror(errno));
@@ -116,7 +138,7 @@ int main(int argc, char **argv)
                 exit(1);
         }
 
-        fprintf(stderr, "seeking\n");
+        fprintf(stderr, "seeking (2)\n");
         rc = lseek(fd, 0, SEEK_SET);
         if (rc) {
                 fprintf(stderr, "seek (after unlink trunc) %s\n",
@@ -132,7 +154,7 @@ int main(int argc, char **argv)
                 exit(1);
         }
 
-        fprintf(stderr, "seeking\n");
+        fprintf(stderr, "seeking (3)\n");
         rc = lseek(fd, 0, SEEK_SET);
         if (rc) {
                 fprintf(stderr, "seek (before unlink read) %s\n",