git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysctl: remove "struct file *" argument of ->proc_handler
[safe/jmp/linux-2.6]
/
kernel
/
trace
/
ftrace.c
diff --git
a/kernel/trace/ftrace.c
b/kernel/trace/ftrace.c
index
f7ab7fc
..
a142579
100644
(file)
--- a/
kernel/trace/ftrace.c
+++ b/
kernel/trace/ftrace.c
@@
-1405,7
+1405,7
@@
static int t_hash_show(struct seq_file *m, void *v)
if (rec->ops->print)
return rec->ops->print(m, rec->ip, rec->ops, rec->data);
if (rec->ops->print)
return rec->ops->print(m, rec->ip, rec->ops, rec->data);
- seq_printf(m, "%p
f:%pf
", (void *)rec->ip, (void *)rec->ops->func);
+ seq_printf(m, "%p
s:%ps
", (void *)rec->ip, (void *)rec->ops->func);
if (rec->data)
seq_printf(m, ":%p", rec->data);
if (rec->data)
seq_printf(m, ":%p", rec->data);
@@
-1515,12
+1515,12
@@
static int t_show(struct seq_file *m, void *v)
if (!rec)
return 0;
if (!rec)
return 0;
- seq_printf(m, "%p
f
\n", (void *)rec->ip);
+ seq_printf(m, "%p
s
\n", (void *)rec->ip);
return 0;
}
return 0;
}
-static struct seq_operations show_ftrace_seq_ops = {
+static
const
struct seq_operations show_ftrace_seq_ops = {
.start = t_start,
.next = t_next,
.stop = t_stop,
.start = t_start,
.next = t_next,
.stop = t_stop,
@@
-2414,11
+2414,9
@@
unsigned long ftrace_graph_funcs[FTRACE_GRAPH_MAX_FUNCS] __read_mostly;
static void *
__g_next(struct seq_file *m, loff_t *pos)
{
static void *
__g_next(struct seq_file *m, loff_t *pos)
{
- unsigned long *array = m->private;
-
if (*pos >= ftrace_graph_count)
return NULL;
if (*pos >= ftrace_graph_count)
return NULL;
- return &
array
[*pos];
+ return &
ftrace_graph_funcs
[*pos];
}
static void *
}
static void *
@@
-2456,12
+2454,12
@@
static int g_show(struct seq_file *m, void *v)
return 0;
}
return 0;
}
- seq_printf(m, "%p
f
\n", (void *)*ptr);
+ seq_printf(m, "%p
s
\n", (void *)*ptr);
return 0;
}
return 0;
}
-static struct seq_operations ftrace_graph_seq_ops = {
+static
const
struct seq_operations ftrace_graph_seq_ops = {
.start = g_start,
.next = g_next,
.stop = g_stop,
.start = g_start,
.next = g_next,
.stop = g_stop,
@@
-2482,16
+2480,10
@@
ftrace_graph_open(struct inode *inode, struct file *file)
ftrace_graph_count = 0;
memset(ftrace_graph_funcs, 0, sizeof(ftrace_graph_funcs));
}
ftrace_graph_count = 0;
memset(ftrace_graph_funcs, 0, sizeof(ftrace_graph_funcs));
}
+ mutex_unlock(&graph_lock);
- if (file->f_mode & FMODE_READ)
{
+ if (file->f_mode & FMODE_READ)
ret = seq_open(file, &ftrace_graph_seq_ops);
ret = seq_open(file, &ftrace_graph_seq_ops);
- if (!ret) {
- struct seq_file *m = file->private_data;
- m->private = ftrace_graph_funcs;
- }
- } else
- file->private_data = ftrace_graph_funcs;
- mutex_unlock(&graph_lock);
return ret;
}
return ret;
}
@@
-2560,7
+2552,6
@@
ftrace_graph_write(struct file *file, const char __user *ubuf,
size_t cnt, loff_t *ppos)
{
struct trace_parser parser;
size_t cnt, loff_t *ppos)
{
struct trace_parser parser;
- unsigned long *array;
size_t read = 0;
ssize_t ret;
size_t read = 0;
ssize_t ret;
@@
-2574,12
+2565,6
@@
ftrace_graph_write(struct file *file, const char __user *ubuf,
goto out;
}
goto out;
}
- if (file->f_mode & FMODE_READ) {
- struct seq_file *m = file->private_data;
- array = m->private;
- } else
- array = file->private_data;
-
if (trace_parser_get_init(&parser, FTRACE_BUFF_MAX)) {
ret = -ENOMEM;
goto out;
if (trace_parser_get_init(&parser, FTRACE_BUFF_MAX)) {
ret = -ENOMEM;
goto out;
@@
-2591,7
+2576,7
@@
ftrace_graph_write(struct file *file, const char __user *ubuf,
parser.buffer[parser.idx] = 0;
/* we allow only one expression at a time */
parser.buffer[parser.idx] = 0;
/* we allow only one expression at a time */
- ret = ftrace_set_func(
array
, &ftrace_graph_count,
+ ret = ftrace_set_func(
ftrace_graph_funcs
, &ftrace_graph_count,
parser.buffer);
if (ret)
goto out;
parser.buffer);
if (ret)
goto out;
@@
-3030,7
+3015,7
@@
int unregister_ftrace_function(struct ftrace_ops *ops)
int
ftrace_enable_sysctl(struct ctl_table *table, int write,
int
ftrace_enable_sysctl(struct ctl_table *table, int write,
-
struct file *file,
void __user *buffer, size_t *lenp,
+ void __user *buffer, size_t *lenp,
loff_t *ppos)
{
int ret;
loff_t *ppos)
{
int ret;
@@
-3040,7
+3025,7
@@
ftrace_enable_sysctl(struct ctl_table *table, int write,
mutex_lock(&ftrace_lock);
mutex_lock(&ftrace_lock);
- ret = proc_dointvec(table, write,
file,
buffer, lenp, ppos);
+ ret = proc_dointvec(table, write, buffer, lenp, ppos);
if (ret || !write || (last_ftrace_enabled == !!ftrace_enabled))
goto out;
if (ret || !write || (last_ftrace_enabled == !!ftrace_enabled))
goto out;