openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tracing/filters: return proper error code when writing filter file 

- propagate return value of filter_add_pred() to the user

- return -ENOSPC but not -ENOMEM or -EINVAL when the filter array
  is full

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Tom Zanussi <tzanussi@gmail.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <49E04CF0.3010105@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Li Zefan 2009-04-11 15:55:28 +08:00 committed by Ingo Molnar
parent a3e0ab0507
commit 44e9c8b7ad
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/trace/trace_events.c
View File

@ -521,9 +521,10 @@ event_filter_write(struct file *filp, const char __user *ubuf, size_t cnt,
return cnt; return cnt;
} }
if (filter_add_pred(call, pred)) { err = filter_add_pred(call, pred);
if (err < 0) {
filter_free_pred(pred); filter_free_pred(pred);
return -EINVAL; return err;
} }
*ppos += cnt; *ppos += cnt;
@ -588,10 +589,11 @@ subsystem_filter_write(struct file *filp, const char __user *ubuf, size_t cnt,
return 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_subsystem_preds(system);
filter_free_pred(pred); filter_free_pred(pred);
return -EINVAL; return err;
} }
*ppos += cnt; *ppos += cnt;

4
kernel/trace/trace_events_filter.c
View File

@ -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) 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) if (i == MAX_FILTER_PRED)
return -EINVAL; return -ENOSPC;
events_for_each(call) { events_for_each(call) {
int err; int err;