LU-4970 tests: turn up debugging for sanity-lfsck/14

[fs/lustre-release.git] / lustre / liblustre / tests / test_common.c

diff --git a/lustre/liblustre/tests/test_common.c b/lustre/liblustre/tests/test_common.c
index 8b7ba3b..1395df3 100644 (file)
--- a/lustre/liblustre/tests/test_common.c
+++ b/lustre/liblustre/tests/test_common.c
@@ -1,5 +1,35 @@
-/* -*- 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 (c) 2003, 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 <sys/stat.h>
@@ -24,6 +54,10 @@ int exit_on_err = 1;
  * util functions
  ******************************************************************/
 
+#ifdef EXIT
+#undef EXIT
+#endif
+
 #define EXIT(err)                                      \
        do {                                            \
                if (exit_on_err)                        \
@@ -329,7 +363,7 @@ void t_grep_v(const char *path, char *str)
 
 void t_ls(int fd, char *buf, int size)
 {
-       cfs_dirent_t *ent;
+       struct dirent64 *ent;
        int rc, pos;
        loff_t base = 0;
 
@@ -337,7 +371,7 @@ void t_ls(int fd, char *buf, int size)
        while ((rc = getdirentries64(fd, buf, size, &base)) > 0) {
                pos = 0;
                while (pos < rc) {
-                       ent = (cfs_dirent_t *) ((char*) buf + pos);
+                       ent = (struct dirent64 *)((char *)buf + pos);
                        printf("%s\n", ent->d_name);
                        pos += ent->d_reclen;
                }