LU-12296 llite: improve ll_dom_lock_cancel

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

diff --git a/lustre/tests/lp_utils.c b/lustre/tests/lp_utils.c
index 0874fac..ea0170b 100644 (file)
--- a/lustre/tests/lp_utils.c
+++ b/lustre/tests/lp_utils.c
@@ -15,17 +15,15 @@
  *
  * 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.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * 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/
@@ -47,7 +45,6 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <libcfs/libcfs.h>
 #include "lustre/lustre_user.h"
 #include "lustre/tests/lp_utils.h"
 
@@ -71,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);
@@ -79,7 +76,7 @@ inline void begin(char *str) {
         }
 }
 
-inline void end(char *str) {
+void end(char *str) {
         float elapsed;
 
         MPI_Barrier(MPI_COMM_WORLD);