X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Ftracefile.h;h=968c128aeb94a4f9ed21d30139ecb19f22e07ab6;hb=725f3f8eb96203b5679da46bfc4e6d22bf1cdf9c;hp=92500170faca5328c5132887a1ec06236d4810c6;hpb=eba158939e20b37e178ad3e0e78f4647e9faee0d;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/tracefile.h b/libcfs/libcfs/tracefile.h
index 9250017..968c128 100644
--- a/libcfs/libcfs/tracefile.h
+++ b/libcfs/libcfs/tracefile.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.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -119,7 +119,7 @@ union cfs_trace_data_union {
 		 * and trace_put_tcd, which are called in libcfs_debug_vmsg2 and
 		 * tcd_for_each_type_lock
 		 */
-		cfs_spinlock_t          tcd_lock;
+		spinlock_t		tcd_lock;
 		unsigned long           tcd_lock_flags;
 
 		/*
@@ -203,7 +203,7 @@ extern union cfs_trace_data_union (*cfs_trace_data[TCD_MAX_TYPES])[CFS_NR_CPUS];
 /* XXX nikita: this declaration is internal to tracefile.c and should probably
  * be moved there */
 struct page_collection {
-	cfs_list_t              pc_pages;
+	cfs_list_t	pc_pages;
 	/*
 	 * spin-lock protecting ->pc_pages. It is taken by smp_call_function()
 	 * call-back functions. XXX nikita: Which is horrible: all processors
@@ -211,23 +211,23 @@ struct page_collection {
 	 * lock. Probably ->pc_pages should be replaced with an array of
 	 * NR_CPUS elements accessed locklessly.
 	 */
-	cfs_spinlock_t          pc_lock;
+	spinlock_t	pc_lock;
 	/*
 	 * if this flag is set, collect_pages() will spill both
 	 * ->tcd_daemon_pages and ->tcd_pages to the ->pc_pages. Otherwise,
 	 * only ->tcd_pages are spilled.
 	 */
-	int                     pc_want_daemon_pages;
+	int		pc_want_daemon_pages;
 };
 
 /* XXX nikita: this declaration is internal to tracefile.c and should probably
  * be moved there */
 struct tracefiled_ctl {
-	cfs_completion_t       tctl_start;
-	cfs_completion_t       tctl_stop;
-	cfs_waitq_t            tctl_waitq;
-	pid_t                  tctl_pid;
-	cfs_atomic_t           tctl_shutdown;
+	struct completion	tctl_start;
+	struct completion	tctl_stop;
+	cfs_waitq_t		tctl_waitq;
+	pid_t			tctl_pid;
+	cfs_atomic_t		tctl_shutdown;
 };
 
 /*