diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-04 11:51:29 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-04 11:51:29 +0100 |
| commit | e02c4fd3142dfb9412531bbfabd510a2a7c6ea46 (patch) | |
| tree | 61b64506b2c016e050f940a89d1ffd36b7c00fdf /kernel/trace/blktrace.c | |
| parent | ae1f30384baef4056438d81b305a6a5199b0d16c (diff) | |
| parent | ac91d85456372a90af5b85eb6620fd2efb1e431b (diff) | |
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'kernel/trace/blktrace.c')
| -rw-r--r-- | kernel/trace/blktrace.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index d9d6206e0b1..07f945a9943 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -540,9 +540,10 @@ int blk_trace_setup(struct request_queue *q, char *name, dev_t dev, if (ret) return ret; - if (copy_to_user(arg, &buts, sizeof(buts))) + if (copy_to_user(arg, &buts, sizeof(buts))) { + blk_trace_remove(q); return -EFAULT; - + } return 0; } EXPORT_SYMBOL_GPL(blk_trace_setup); |