blktrace: remove unnessary stop block trace in 'blk_trace_shutdown'
authorYe Bin <yebin10@huawei.com>
Wed, 19 Oct 2022 03:36:02 +0000 (11:36 +0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 20 Oct 2022 13:02:52 +0000 (06:02 -0700)
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 <yebin10@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20221019033602.752383-4-yebin@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
kernel/trace/blktrace.c

index e17bba027a2c6edd4d45569bffb792b321d4deb5..a995ea1ef849a4ef6b607c443b6a7bbdbbe548c5 100644 (file)
@@ -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