X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Flp_utils.c;h=ea0170b4af2ba7691d33f6ce939f74d7fc1ac4c5;hb=6e6a3ac4ef3231463e05935ee68a1508b3a5d8d4;hp=0ca7a85bdb92f501e46f5dbd1931e2a6dcdb0b3f;hpb=2dc9c16e770415d56839e1996015fec5fab93f29;p=fs%2Flustre-release.git

diff --git a/lustre/tests/lp_utils.c b/lustre/tests/lp_utils.c
index 0ca7a85..ea0170b 100644
--- a/lustre/tests/lp_utils.c
+++ b/lustre/tests/lp_utils.c
@@ -1,23 +1,37 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- * Copyright (C) 2002 Cluster File Systems, Inc.
- *   Author: You Feng <youfeng@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * 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.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License 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).
  *
- *   Lustre 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 for more details.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Intel Corporation.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/tests/lp_utils.c
+ *
+ * Author: You Feng <youfeng@clusterfs.com>
  */
 
 #include <mpi.h>
@@ -32,7 +46,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include "lustre/lustre_user.h"
-#include "lp_utils.h"
+#include "lustre/tests/lp_utils.h"
 
 #define MAX_PROCESSES 8
 
@@ -54,7 +68,7 @@ char *timestamp() {
         return datestring;
 }
 
-inline void begin(char *str) {
+void begin(char *str) {
         if (verbose > 0 && rank == 0) {
                 gettimeofday(&t1, NULL);
                 printf("%s:\tBeginning %s\n", timestamp(), str);
@@ -62,7 +76,7 @@ inline void begin(char *str) {
         }
 }
 
-inline void end(char *str) {
+void end(char *str) {
         float elapsed;
 
         MPI_Barrier(MPI_COMM_WORLD);