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 e450c36..c471e3b 100644 (file)
--- a/lustre/tests/openunlink.c
+++ b/lustre/tests/openunlink.c
@@ -1,6 +1,4 @@
-/* -*- 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.
@@ -16,8 +14,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 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -91,18 +89,20 @@ int main(int argc, char **argv)
                 getc(stdin);
         }
 
-        if (access(fname, F_OK) == 0) {
-                fprintf(stderr, "%s still exists\n", fname2);
-                exit(1);
-        }
+        fprintf(stderr, "accessing (1)\n");
+       if (access(fname, F_OK) == 0) {
+               fprintf(stderr, "%s still exists\n", fname);
+               exit(1);
+       }
 
-        fprintf(stderr, "resetting fd offset\n");
+        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);
@@ -138,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",
@@ -154,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",