Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Nov 2021 23:13:01 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: aa7aa23171c8 - stable/13 - crypto: Cleanup mtx_init() calls.
Message-ID:  <202111232313.1ANND11M037836@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=aa7aa23171c86d0f05a90cef646ae6d1a3d1200e

commit aa7aa23171c86d0f05a90cef646ae6d1a3d1200e
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2021-11-02 18:27:20 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2021-11-23 23:11:49 +0000

    crypto: Cleanup mtx_init() calls.
    
    Don't pass the same name to multiple mutexes while using unique types
    for WITNESS.  Just use the unique types as the mutex names.
    
    Reviewed by:    markj
    Sponsored by:   Chelsio Communications
    Differential Revision:  https://reviews.freebsd.org/D32740
    
    (cherry picked from commit 4e057806cf56b238a0a3ef7af140f447d7b67ab5)
---
 sys/opencrypto/crypto.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c
index a151ee21dce7..576382406d88 100644
--- a/sys/opencrypto/crypto.c
+++ b/sys/opencrypto/crypto.c
@@ -327,12 +327,11 @@ crypto_init(void)
 	struct proc *p;
 	int error;
 
-	mtx_init(&crypto_drivers_mtx, "crypto", "crypto driver table",
-		MTX_DEF|MTX_QUIET);
+	mtx_init(&crypto_drivers_mtx, "crypto driver table", NULL, MTX_DEF);
 
 	TAILQ_INIT(&crp_q);
 	TAILQ_INIT(&crp_kq);
-	mtx_init(&crypto_q_mtx, "crypto", "crypto op queues", MTX_DEF);
+	mtx_init(&crypto_q_mtx, "crypto op queues", NULL, MTX_DEF);
 
 	cryptop_zone = uma_zcreate("cryptop",
 	    sizeof(struct cryptop), NULL, NULL, NULL, NULL,
@@ -371,7 +370,8 @@ crypto_init(void)
 		ret_worker->reorder_ops = 0;
 		ret_worker->reorder_cur_seq = 0;
 
-		mtx_init(&ret_worker->crypto_ret_mtx, "crypto", "crypto return queues", MTX_DEF);
+		mtx_init(&ret_worker->crypto_ret_mtx, "crypto return queues",
+		    NULL, MTX_DEF);
 
 		error = kthread_add(crypto_ret_thread, ret_worker, p,
 		    &ret_worker->td, 0, 0, "crypto returns %td",



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111232313.1ANND11M037836>