[-next,3/3] blktrace: remove unnessary stop block trace in 'blk_trace_shutdown'

Message ID 20221017065321.2846017-4-yebin10@huawei.com
State New
Headers
Series fix possible memleak in '__blk_trace_remove' |

Commit Message

Ye Bin Oct. 17, 2022, 6:53 a.m. UTC
  As previous commit, '__blk_trace_remove' 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>
---
 kernel/trace/blktrace.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
  

Patch

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 0d93a0110ab5..f33ec0f5750a 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -777,10 +777,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