blktrace: fix trace mutex deadlock
authorJens Axboe <axboe@kernel.dk>
Sun, 19 Nov 2017 18:52:55 +0000 (11:52 -0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 27 Nov 2017 19:03:58 +0000 (12:03 -0700)
commit2967acbb257a6a9bf912f4778b727e00972eac9b
treebe2c900c9cdf5616713f21b8bb3c2d4f34426fee
parent6c4ca1e36cdc1a0a7a84797804b87920ccbebf51
blktrace: fix trace mutex deadlock

A previous commit changed the locking around registration/cleanup,
but direct callers of blk_trace_remove() were missed. This means
that if we hit the error path in setup, we will deadlock on
attempting to re-acquire the queue trace mutex.

Fixes: 1f2cac107c59 ("blktrace: fix unlocked access to init/start-stop/teardown")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
kernel/trace/blktrace.c