Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

blktrace: don't increase blk_probes_ref if failed to setup blk trace

Browse source 
do_blk_trace_setup() may return EBUSY, but the current code
doesn't decrease blk_probes_ref in this case.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <49C2F5FF.80002@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Li Zefan 2009-03-20 09:48:47 +08:00 committed by Ingo Molnar
parent 3c289ba7c3
commit cbe28296eb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/trace/blktrace.c
View file

@ -468,9 +468,6 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
bt->pid = buts->pid;
bt->trace_state = Blktrace_setup;
if (atomic_add_return(1, &blk_probes_ref) == 1)
blk_register_tracepoints();
ret = -EBUSY;
old_bt = xchg(&q->blk_trace, bt);
if (old_bt) {
@ -478,6 +475,9 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
goto err;
}
if (atomic_add_return(1, &blk_probes_ref) == 1)
blk_register_tracepoints();
return 0;
err:
if (bt) {