blktrace: remove unnessary stop block trace in 'blk_trace_shutdown'

Ye Bin · axboe · commit 2db96217e7e5 · 2022-10-20T06:02:52.000-07:00
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>
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -776,10 +776,8 @@ int blk_trace_ioctl(struct block_device bdev, unsigned cmd, char __user arg)`
`776`	`776`	`void blk_trace_shutdown(struct request_queue *q)`
`777`	`777`	`{`
`778`	`778`	`if (rcu_dereference_protected(q->blk_trace,`
`779`		`- lockdep_is_held(&q->debugfs_mutex))) {`
`780`		`- __blk_trace_startstop(q, 0);`
	`779`	`+ lockdep_is_held(&q->debugfs_mutex)))`
`781`	`780`	`__blk_trace_remove(q);`
`782`		`- }`
`783`	`781`	`}`
`784`	`782`
`785`	`783`	`#ifdef CONFIG_BLK_CGROUP`