X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Flp_utils.h;h=b312534ac0d5d15d389f8dd44154c760cbd57e69;hb=11eba11fe0457b735194e5924e7bb1882a5b31b8;hp=ad5c911624df49d85032e514c6fdb1d28a188628;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git

diff --git a/lustre/tests/lp_utils.h b/lustre/tests/lp_utils.h
index ad5c911..b312534 100644
--- a/lustre/tests/lp_utils.h
+++ b/lustre/tests/lp_utils.h
@@ -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,17 +14,13 @@
  * 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].
- *
- * 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.
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -41,7 +35,7 @@
 #ifndef __LP_UTILS_H__
 #define __LP_UTILS_H__
 
-#include "lustre/lustre_user.h"
+#include <linux/lustre/lustre_user.h>
 
 #define FAIL(msg) \
  \
@@ -69,8 +63,8 @@ extern char hostname[];
 extern char *timestamp();
 extern char *testdir;
 
-extern inline void begin(char *str);
-extern inline void end(char *str);
+extern void begin(char *str);
+extern void end(char *str);
 
 extern void dump_diff(char *orig_buf, char *buf, int len, long off);
 extern void lp_gethostname(void);