From 4a0ef65b4947869a293358935a63f90d3fc902f1 Mon Sep 17 00:00:00 2001 From: "jolsa@redhat.com" Date: Fri, 11 Sep 2009 17:29:28 +0200 Subject: [PATCH] --- yaml --- r: 162951 b: refs/heads/master c: 489663644c35d50a20f58d468a7cbc705e6a29ce h: refs/heads/master i: 162949: 8f99ec3183ab88473a702f29e50b0eebc2cd5bfe 162947: 83b27a1721b097aa744fd969910fa2539008d2ae 162943: 60cebe31ca483d908af12d45ec221da96ab9a2cd v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_events.c | 60 +++++++------------------------ 2 files changed, 14 insertions(+), 48 deletions(-) diff --git a/[refs] b/[refs] index 9e9fb207b73a..d38aa3b601e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b63f39ea50330f836e301ddda21c6a93dcf0d6a3 +refs/heads/master: 489663644c35d50a20f58d468a7cbc705e6a29ce diff --git a/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c index 975f324a07e7..f46d14cefdec 100644 --- a/trunk/kernel/trace/trace_events.c +++ b/trunk/kernel/trace/trace_events.c @@ -230,11 +230,9 @@ static ssize_t ftrace_event_write(struct file *file, const char __user *ubuf, size_t cnt, loff_t *ppos) { + struct trace_parser parser; size_t read = 0; - int i, set = 1; ssize_t ret; - char *buf; - char ch; if (!cnt || cnt < 0) return 0; @@ -243,60 +241,28 @@ ftrace_event_write(struct file *file, const char __user *ubuf, if (ret < 0) return ret; - ret = get_user(ch, ubuf++); - if (ret) - return ret; - read++; - cnt--; - - /* skip white space */ - while (cnt && isspace(ch)) { - ret = get_user(ch, ubuf++); - if (ret) - return ret; - read++; - cnt--; - } - - /* Only white space found? */ - if (isspace(ch)) { - file->f_pos += read; - ret = read; - return ret; - } - - buf = kmalloc(EVENT_BUF_SIZE+1, GFP_KERNEL); - if (!buf) + if (trace_parser_get_init(&parser, EVENT_BUF_SIZE + 1)) return -ENOMEM; - if (cnt > EVENT_BUF_SIZE) - cnt = EVENT_BUF_SIZE; + read = trace_get_user(&parser, ubuf, cnt, ppos); + + if (trace_parser_loaded((&parser))) { + int set = 1; - i = 0; - while (cnt && !isspace(ch)) { - if (!i && ch == '!') + if (*parser.buffer == '!') set = 0; - else - buf[i++] = ch; - ret = get_user(ch, ubuf++); + parser.buffer[parser.idx] = 0; + + ret = ftrace_set_clr_event(parser.buffer + !set, set); if (ret) - goto out_free; - read++; - cnt--; + goto out_put; } - buf[i] = 0; - - file->f_pos += read; - - ret = ftrace_set_clr_event(buf, set); - if (ret) - goto out_free; ret = read; - out_free: - kfree(buf); + out_put: + trace_parser_put(&parser); return ret; }