Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-1282 misc: Use present cpu numbers to save memory.
[fs/lustre-release.git]
/
libcfs
/
libcfs
/
linux
/
linux-tracefile.c
diff --git
a/libcfs/libcfs/linux/linux-tracefile.c
b/libcfs/libcfs/linux/linux-tracefile.c
index
7352e14
..
411178c
100644
(file)
--- a/
libcfs/libcfs/linux/linux-tracefile.c
+++ b/
libcfs/libcfs/linux/linux-tracefile.c
@@
-61,8
+61,8
@@
int cfs_tracefile_init_arch()
memset(cfs_trace_data, 0, sizeof(cfs_trace_data));
for (i = 0; i < CFS_TCD_TYPE_MAX; i++) {
cfs_trace_data[i] =
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) * NR_CPUS,
- GFP_KERNEL);
+ kmalloc(sizeof(union cfs_trace_data_union) *
+
cfs_num_possible_cpus(),
GFP_KERNEL);
if (cfs_trace_data[i] == NULL)
goto out;
if (cfs_trace_data[i] == NULL)
goto out;
@@
-76,11
+76,11
@@
int cfs_tracefile_init_arch()
tcd->tcd_cpu = j;
}
tcd->tcd_cpu = j;
}
- for (i = 0; i < num_possible_cpus(); i++)
+ for (i = 0; i <
cfs_
num_possible_cpus(); i++)
for (j = 0; j < 3; j++) {
for (j = 0; j < 3; j++) {
-
cfs_trace_console_buffers[i][j] =
-
kmalloc(CFS_TRACE_CONSOLE_BUFFER_SIZE,
-
GFP_KERNEL);
+ cfs_trace_console_buffers[i][j] =
+ kmalloc(CFS_TRACE_CONSOLE_BUFFER_SIZE,
+ GFP_KERNEL);
if (cfs_trace_console_buffers[i][j] == NULL)
goto out;
if (cfs_trace_console_buffers[i][j] == NULL)
goto out;
@@
-92,7
+92,6
@@
out:
cfs_tracefile_fini_arch();
printk(KERN_ERR "lnet: Not enough memory\n");
return -ENOMEM;
cfs_tracefile_fini_arch();
printk(KERN_ERR "lnet: Not enough memory\n");
return -ENOMEM;
-
}
void cfs_tracefile_fini_arch()
}
void cfs_tracefile_fini_arch()
@@
-100,7
+99,7
@@
void cfs_tracefile_fini_arch()
int i;
int j;
int i;
int j;
- for (i = 0; i < num_possible_cpus(); i++)
+ for (i = 0; i <
cfs_
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]);
for (j = 0; j < 3; j++)
if (cfs_trace_console_buffers[i][j] != NULL) {
kfree(cfs_trace_console_buffers[i][j]);