From a918b9167086c8915c3fd31442ef7070721427a6 Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Sat, 11 Apr 2009 15:55:28 +0800 Subject: [PATCH] --- yaml --- r: 143118 b: refs/heads/master c: 44e9c8b7adc52079f0535f9de0c2c2477831389b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_events.c | 10 ++++++---- trunk/kernel/trace/trace_events_filter.c | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5760ac659fcc..a27587838107 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3e0ab050774117d4a6173087c8bf3888662a83f +refs/heads/master: 44e9c8b7adc52079f0535f9de0c2c2477831389b diff --git a/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c index 054bc1802bcd..576f4fa2af0d 100644 --- a/trunk/kernel/trace/trace_events.c +++ b/trunk/kernel/trace/trace_events.c @@ -521,9 +521,10 @@ event_filter_write(struct file *filp, const char __user *ubuf, size_t cnt, return cnt; } - if (filter_add_pred(call, pred)) { + err = filter_add_pred(call, pred); + if (err < 0) { filter_free_pred(pred); - return -EINVAL; + return err; } *ppos += cnt; @@ -588,10 +589,11 @@ subsystem_filter_write(struct file *filp, const char __user *ubuf, size_t cnt, return cnt; } - if (filter_add_subsystem_pred(system, pred)) { + err = filter_add_subsystem_pred(system, pred); + if (err < 0) { filter_free_subsystem_preds(system); filter_free_pred(pred); - return -EINVAL; + return err; } *ppos += cnt; diff --git a/trunk/kernel/trace/trace_events_filter.c b/trunk/kernel/trace/trace_events_filter.c index 49b3ef54ec46..e03cbf1e38f3 100644 --- a/trunk/kernel/trace/trace_events_filter.c +++ b/trunk/kernel/trace/trace_events_filter.c @@ -215,7 +215,7 @@ static int __filter_add_pred(struct ftrace_event_call *call, } } - return -ENOMEM; + return -ENOSPC; } static int is_string_field(const char *type) @@ -319,7 +319,7 @@ int filter_add_subsystem_pred(struct event_subsystem *system, } if (i == MAX_FILTER_PRED) - return -EINVAL; + return -ENOSPC; events_for_each(call) { int err;