From: Ye Bin Date: Wed, 19 Oct 2022 03:36:02 +0000 (+0800) Subject: blktrace: remove unnessary stop block trace in 'blk_trace_shutdown' X-Git-Tag: v6.6.17~6063^2~31 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2db96217e7e515071726ca4ec791742c4202a1b2;p=platform%2Fkernel%2Flinux-rpi.git blktrace: remove unnessary stop block trace in 'blk_trace_shutdown' As previous commit, 'blk_trace_cleanup' will stop block trace if block trace's state is 'Blktrace_running'. So remove unnessary stop block trace in 'blk_trace_shutdown'. Signed-off-by: Ye Bin Reviewed-by: Christoph Hellwig Link: https://lore.kernel.org/r/20221019033602.752383-4-yebin@huaweicloud.com Signed-off-by: Jens Axboe --- diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index e17bba0..a995ea1 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -776,10 +776,8 @@ int blk_trace_ioctl(struct block_device *bdev, unsigned cmd, char __user *arg) void blk_trace_shutdown(struct request_queue *q) { if (rcu_dereference_protected(q->blk_trace, - lockdep_is_held(&q->debugfs_mutex))) { - __blk_trace_startstop(q, 0); + lockdep_is_held(&q->debugfs_mutex))) __blk_trace_remove(q); - } } #ifdef CONFIG_BLK_CGROUP