lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ftrace: simple clean ups

Browse Source 
Andrew Morton mentioned some clean ups that should be done to ftrace.
This patch does some of the simple clean ups.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Steven Rostedt
2008-05-12 21:21:00 +02:00
committed by Thomas Gleixner
parent afc2abc0ae
commit cffae437cd
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
kernel/trace/trace.c
View File

@@ -36,8 +36,7 @@ unsigned long __read_mostly tracing_max_latency = (cycle_t)ULONG_MAX;
unsigned long __read_mostly tracing_thresh; unsigned long __read_mostly tracing_thresh;
/* dummy trace to disable tracing */ /* dummy trace to disable tracing */
static struct tracer no_tracer __read_mostly = static struct tracer no_tracer __read_mostly = {
{
.name = "none", .name = "none",
}; };
@@ -1906,8 +1905,8 @@ tracing_iter_ctrl_write(struct file *filp, const char __user *ubuf,
int neg = 0; int neg = 0;
int i; int i;
if (cnt > 63) if (cnt >= sizeof(buf))
cnt = 63; return -EINVAL;
if (copy_from_user(&buf, ubuf, cnt)) if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT; return -EFAULT;
@@ -1999,8 +1998,8 @@ tracing_ctrl_write(struct file *filp, const char __user *ubuf,
long val; long val;
char buf[64]; char buf[64];
if (cnt > 63) if (cnt >= sizeof(buf))
cnt = 63; return -EINVAL;
if (copy_from_user(&buf, ubuf, cnt)) if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT; return -EFAULT;
@@ -2099,10 +2098,10 @@ tracing_max_lat_read(struct file *filp, char __user *ubuf,
char buf[64]; char buf[64];
int r; int r;
r = snprintf(buf, 64, "%ld\n", r = snprintf(buf, sizeof(buf), "%ld\n",
*ptr == (unsigned long)-1 ? -1 : nsecs_to_usecs(*ptr)); *ptr == (unsigned long)-1 ? -1 : nsecs_to_usecs(*ptr));
if (r > 64) if (r > sizeof(buf))
r = 64; r = sizeof(buf);
return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
} }
@@ -2114,8 +2113,8 @@ tracing_max_lat_write(struct file *filp, const char __user *ubuf,
long val; long val;
char buf[64]; char buf[64];
if (cnt > 63) if (cnt >= sizeof(buf))
cnt = 63; return -EINVAL;
if (copy_from_user(&buf, ubuf, cnt)) if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT; return -EFAULT;
@@ -2378,8 +2377,8 @@ tracing_entries_write(struct file *filp, const char __user *ubuf,
unsigned long val; unsigned long val;
char buf[64]; char buf[64];
if (cnt > 63) if (cnt >= sizeof(buf))
cnt = 63; return -EINVAL;
if (copy_from_user(&buf, ubuf, cnt)) if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT; return -EFAULT;