/*
* 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/
10 /* 10% pages for CFS_TCD_TYPE_DISPATCH */
};
-char *cfs_trace_console_buffers[CFS_NR_CPUS][CFS_TCD_TYPE_MAX];
+char *cfs_trace_console_buffers[NR_CPUS][CFS_TCD_TYPE_MAX];
-cfs_rw_semaphore_t cfs_tracefile_sem;
+struct rw_semaphore cfs_tracefile_sem;
int cfs_tracefile_init_arch()
{
int j;
struct cfs_trace_cpu_data *tcd;
- cfs_init_rwsem(&cfs_tracefile_sem);
+ 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] =
- cfs_alloc(sizeof(union cfs_trace_data_union) * \
- CFS_NR_CPUS, GFP_KERNEL);
+ kmalloc(sizeof(union cfs_trace_data_union) * \
+ NR_CPUS, GFP_KERNEL);
if (cfs_trace_data[i] == NULL)
goto out;
}
tcd->tcd_cpu = (USHORT)j;
}
- for (i = 0; i < cfs_num_possible_cpus(); i++)
+ for (i = 0; i < num_possible_cpus(); i++)
for (j = 0; j < CFS_TCD_TYPE_MAX; j++) {
cfs_trace_console_buffers[i][j] =
- cfs_alloc(CFS_TRACE_CONSOLE_BUFFER_SIZE,
- GFP_KERNEL);
+ kmalloc(CFS_TRACE_CONSOLE_BUFFER_SIZE,
+ GFP_KERNEL);
if (cfs_trace_console_buffers[i][j] == NULL)
goto out;
out:
cfs_tracefile_fini_arch();
- printk(CFS_KERN_ERR "lnet: Not enough memory\n");
+ printk(KERN_ERR "lnet: Not enough memory\n");
return -ENOMEM;
}
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 < CFS_TCD_TYPE_MAX; j++) {
if (cfs_trace_console_buffers[i][j] != NULL) {
- cfs_free(cfs_trace_console_buffers[i][j]);
+ kfree(cfs_trace_console_buffers[i][j]);
cfs_trace_console_buffers[i][j] = NULL;
}
}
}
for (i = 0; cfs_trace_data[i] != NULL; i++) {
- cfs_free(cfs_trace_data[i]);
+ kfree(cfs_trace_data[i]);
cfs_trace_data[i] = NULL;
}
- cfs_fini_rwsem(&cfs_tracefile_sem);
+ 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()
{
struct timeval tv;
- cfs_gettimeofday(&tv);
+ do_gettimeofday(&tv);
header->ph_subsys = subsys;
header->ph_mask = 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;
if ((mask & D_EMERG) != 0) {
prefix = "LustreError";
- ptype = CFS_KERN_EMERG;
+ ptype = KERN_EMERG;
} else if ((mask & D_ERROR) != 0) {
prefix = "LustreError";
- ptype = CFS_KERN_ERR;
+ ptype = KERN_ERR;
} else if ((mask & D_WARNING) != 0) {
prefix = "Lustre";
- ptype = CFS_KERN_WARNING;
+ ptype = KERN_WARNING;
} else if ((mask & (D_CONSOLE | libcfs_printk)) != 0) {
prefix = "Lustre";
- ptype = CFS_KERN_INFO;
+ ptype = KERN_INFO;
}
if ((mask & D_CONSOLE) != 0) {
int cfs_trace_max_debug_mb(void)
{
- int total_mb = (cfs_num_physpages >> (20 - CFS_PAGE_SHIFT));
-
+ int total_mb = (totalram_pages >> (20 - PAGE_CACHE_SHIFT));
+
return MAX(512, (total_mb * 80)/100);
}