X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-tracefile.c;h=778a56fbb62d14d1c5046f5a8f4780e660a78e19;hb=refs%2Fchanges%2F93%2F13793%2F4;hp=411178c6357453201841fa38bc8869aba126618b;hpb=65dc702123f91c4fb2ae25604f98e195fcc15544;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/linux/linux-tracefile.c b/libcfs/libcfs/linux/linux-tracefile.c
index 411178c..778a56f 100644
--- a/libcfs/libcfs/linux/linux-tracefile.c
+++ b/libcfs/libcfs/linux/linux-tracefile.c
@@ -26,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/
@@ -47,7 +49,7 @@ static unsigned int pages_factor[CFS_TCD_TYPE_MAX] = {
 
 char *cfs_trace_console_buffers[NR_CPUS][CFS_TCD_TYPE_MAX];
 
-cfs_rw_semaphore_t cfs_tracefile_sem;
+static DECLARE_RWSEM(cfs_tracefile_sem);
 
 int cfs_tracefile_init_arch()
 {
@@ -55,14 +57,12 @@ int cfs_tracefile_init_arch()
 	int    j;
 	struct cfs_trace_cpu_data *tcd;
 
-	cfs_init_rwsem(&cfs_tracefile_sem);
-
 	/* initialize trace_data */
 	memset(cfs_trace_data, 0, sizeof(cfs_trace_data));
 	for (i = 0; i < CFS_TCD_TYPE_MAX; i++) {
 		cfs_trace_data[i] =
 			kmalloc(sizeof(union cfs_trace_data_union) *
-				cfs_num_possible_cpus(), GFP_KERNEL);
+				num_possible_cpus(), GFP_KERNEL);
 		if (cfs_trace_data[i] == NULL)
 			goto out;
 
@@ -70,13 +70,13 @@ int cfs_tracefile_init_arch()
 
 	/* arch related info initialized */
 	cfs_tcd_for_each(tcd, i, j) {
-		cfs_spin_lock_init(&tcd->tcd_lock);
+		spin_lock_init(&tcd->tcd_lock);
 		tcd->tcd_pages_factor = pages_factor[i];
 		tcd->tcd_type = i;
 		tcd->tcd_cpu = j;
 	}
 
-	for (i = 0; i < cfs_num_possible_cpus(); i++)
+	for (i = 0; i < num_possible_cpus(); i++)
 		for (j = 0; j < 3; j++) {
 			cfs_trace_console_buffers[i][j] =
 				kmalloc(CFS_TRACE_CONSOLE_BUFFER_SIZE,
@@ -99,7 +99,7 @@ void cfs_tracefile_fini_arch()
 	int    i;
 	int    j;
 
-	for (i = 0; i < cfs_num_possible_cpus(); i++)
+	for (i = 0; i < num_possible_cpus(); i++)
 		for (j = 0; j < 3; j++)
 			if (cfs_trace_console_buffers[i][j] != NULL) {
 				kfree(cfs_trace_console_buffers[i][j]);
@@ -110,28 +110,26 @@ void cfs_tracefile_fini_arch()
 		kfree(cfs_trace_data[i]);
 		cfs_trace_data[i] = NULL;
 	}
-
-	cfs_fini_rwsem(&cfs_tracefile_sem);
 }
 
 void cfs_tracefile_read_lock()
 {
-	cfs_down_read(&cfs_tracefile_sem);
+	down_read(&cfs_tracefile_sem);
 }
 
 void cfs_tracefile_read_unlock()
 {
-	cfs_up_read(&cfs_tracefile_sem);
+	up_read(&cfs_tracefile_sem);
 }
 
 void cfs_tracefile_write_lock()
 {
-	cfs_down_write(&cfs_tracefile_sem);
+	down_write(&cfs_tracefile_sem);
 }
 
 void cfs_tracefile_write_unlock()
 {
-	cfs_up_write(&cfs_tracefile_sem);
+	up_write(&cfs_tracefile_sem);
 }
 
 cfs_trace_buf_type_t cfs_trace_buf_idx_get()
@@ -151,30 +149,32 @@ cfs_trace_buf_type_t cfs_trace_buf_idx_get()
  * for details.
  */
 int cfs_trace_lock_tcd(struct cfs_trace_cpu_data *tcd, int walking)
+__acquires(&tcd->tcd_lock)
 {
 	__LASSERT(tcd->tcd_type < CFS_TCD_TYPE_MAX);
-        if (tcd->tcd_type == CFS_TCD_TYPE_IRQ)
-                cfs_spin_lock_irqsave(&tcd->tcd_lock, tcd->tcd_lock_flags);
-        else if (tcd->tcd_type == CFS_TCD_TYPE_SOFTIRQ)
-                cfs_spin_lock_bh(&tcd->tcd_lock);
-        else if (unlikely(walking))
-                cfs_spin_lock_irq(&tcd->tcd_lock);
-        else
-                cfs_spin_lock(&tcd->tcd_lock);
+	if (tcd->tcd_type == CFS_TCD_TYPE_IRQ)
+		spin_lock_irqsave(&tcd->tcd_lock, tcd->tcd_lock_flags);
+	else if (tcd->tcd_type == CFS_TCD_TYPE_SOFTIRQ)
+		spin_lock_bh(&tcd->tcd_lock);
+	else if (unlikely(walking))
+		spin_lock_irq(&tcd->tcd_lock);
+	else
+		spin_lock(&tcd->tcd_lock);
 	return 1;
 }
 
 void cfs_trace_unlock_tcd(struct cfs_trace_cpu_data *tcd, int walking)
+__releases(&tcd->tcd_lock)
 {
 	__LASSERT(tcd->tcd_type < CFS_TCD_TYPE_MAX);
-        if (tcd->tcd_type == CFS_TCD_TYPE_IRQ)
-                cfs_spin_unlock_irqrestore(&tcd->tcd_lock, tcd->tcd_lock_flags);
-        else if (tcd->tcd_type == CFS_TCD_TYPE_SOFTIRQ)
-                cfs_spin_unlock_bh(&tcd->tcd_lock);
-        else if (unlikely(walking))
-                cfs_spin_unlock_irq(&tcd->tcd_lock);
-        else
-                cfs_spin_unlock(&tcd->tcd_lock);
+	if (tcd->tcd_type == CFS_TCD_TYPE_IRQ)
+		spin_unlock_irqrestore(&tcd->tcd_lock, tcd->tcd_lock_flags);
+	else if (tcd->tcd_type == CFS_TCD_TYPE_SOFTIRQ)
+		spin_unlock_bh(&tcd->tcd_lock);
+	else if (unlikely(walking))
+		spin_unlock_irq(&tcd->tcd_lock);
+	else
+		spin_unlock(&tcd->tcd_lock);
 }
 
 int cfs_tcd_owns_tage(struct cfs_trace_cpu_data *tcd,
@@ -198,7 +198,7 @@ cfs_set_ptldebug_header(struct ptldebug_header *header,
 
 	header->ph_subsys = msgdata->msg_subsys;
 	header->ph_mask = msgdata->msg_mask;
-	header->ph_cpu_id = cfs_smp_processor_id();
+	header->ph_cpu_id = smp_processor_id();
 	header->ph_type = cfs_trace_buf_idx_get();
 	header->ph_sec = (__u32)tv.tv_sec;
 	header->ph_usec = tv.tv_usec;
@@ -267,7 +267,7 @@ void cfs_print_to_console(struct ptldebug_header *hdr, int mask,
 
 int cfs_trace_max_debug_mb(void)
 {
-	int  total_mb = (cfs_num_physpages >> (20 - PAGE_SHIFT));
+	int  total_mb = (totalram_pages >> (20 - PAGE_SHIFT));
 
 	return MAX(512, (total_mb * 80)/100);
 }