Commit 17fdfd08 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'trace-fixes-v3.10-rc2' of...

Merge tag 'trace-fixes-v3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Masami Hiramatsu fixed another bug.  This time returning a proper
  result in event_enable_func().  After checking the return status of
  try_module_get(), it returned the status of try_module_get().

  But try_module_get() returns 0 on failure, which is success for
  event_enable_func()"

* tag 'trace-fixes-v3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Return -EBUSY when event_enable_func() fails to get module
parents a8432588 6ed01066
...@@ -2072,8 +2072,10 @@ event_enable_func(struct ftrace_hash *hash, ...@@ -2072,8 +2072,10 @@ event_enable_func(struct ftrace_hash *hash,
out_reg: out_reg:
/* Don't let event modules unload while probe registered */ /* Don't let event modules unload while probe registered */
ret = try_module_get(file->event_call->mod); ret = try_module_get(file->event_call->mod);
if (!ret) if (!ret) {
ret = -EBUSY;
goto out_free; goto out_free;
}
ret = __ftrace_event_enable_disable(file, 1, 1); ret = __ftrace_event_enable_disable(file, 1, 1);
if (ret < 0) if (ret < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment