Skip to content

Commit cbe2829

Browse files
Li ZefanIngo Molnar
authored andcommitted
blktrace: don't increase blk_probes_ref if failed to setup blk trace
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 <[email protected]> Acked-by: Frederic Weisbecker <[email protected]> Acked-by: Arnaldo Carvalho de Melo <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Steven Rostedt <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
1 parent 3c289ba commit cbe2829

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

kernel/trace/blktrace.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,16 +468,16 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
468468
bt->pid = buts->pid;
469469
bt->trace_state = Blktrace_setup;
470470

471-
if (atomic_add_return(1, &blk_probes_ref) == 1)
472-
blk_register_tracepoints();
473-
474471
ret = -EBUSY;
475472
old_bt = xchg(&q->blk_trace, bt);
476473
if (old_bt) {
477474
(void) xchg(&q->blk_trace, old_bt);
478475
goto err;
479476
}
480477

478+
if (atomic_add_return(1, &blk_probes_ref) == 1)
479+
blk_register_tracepoints();
480+
481481
return 0;
482482
err:
483483
if (bt) {

0 commit comments

Comments
 (0)