linux-kernel - [PATCH] blktrace:use '__blk_trace_remove' helper in 'blk_trace_remove

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:   Wed, 26 Oct 2022 15:56:31 +0800
From:   Ye Bin <yebin@...weicloud.com>
To:     axboe@...nel.dk, rostedt@...dmis.org, mhiramat@...nel.org,
        linux-block@...r.kernel.org
Cc:     linux-kernel@...r.kernel.org, Ye Bin <yebin10@...wei.com>
Subject: [PATCH] blktrace:use '__blk_trace_remove' helper in 'blk_trace_remove_queue'

From: Ye Bin <yebin10@...wei.com>

After '60a9bb9048f9' and 'dcd1a59c62dc' commit 'blk_trace_remove_queue' is do
the same job with '__blk_trace_remove', so just call '__blk_trace_remove'.

Signed-off-by: Ye Bin <yebin10@...wei.com>
---
 kernel/trace/blktrace.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index a995ea1ef849..115ae18e479d 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1609,19 +1609,7 @@ device_initcall(init_blk_tracer);
 
 static int blk_trace_remove_queue(struct request_queue *q)
 {
-	struct blk_trace *bt;
-
-	bt = rcu_replace_pointer(q->blk_trace, NULL,
-				 lockdep_is_held(&q->debugfs_mutex));
-	if (bt == NULL)
-		return -EINVAL;
-
-	blk_trace_stop(bt);
-
-	put_probe_ref();
-	synchronize_rcu();
-	blk_trace_free(q, bt);
-	return 0;
+	return __blk_trace_remove(q);
 }
 
 /*
-- 
2.31.1