From nobody Mon Dec 06 15:55:14 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A67F518C3F87; Mon, 6 Dec 2021 15:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J77LC0d20z4Zsn; Mon, 6 Dec 2021 15:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C6C7A6A91; Mon, 6 Dec 2021 15:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B6FtEJW032687; Mon, 6 Dec 2021 15:55:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6FtEm6032686; Mon, 6 Dec 2021 15:55:14 GMT (envelope-from git) Date: Mon, 6 Dec 2021 15:55:14 GMT Message-Id: <202112061555.1B6FtEm6032686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 3d23a13d2294 - stable/12 - Correct the name of the second parameter of biowait to wmesg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3d23a13d229436f327bfe391d9eaa4767bbb5224 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638806115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x8naxd7NH8oXjJWod7G8YGA+LshzTGPKWwGZbo6ffnM=; b=ZhsFe4AS3g1cfEoyOoHwvOaOTa4LsTkE/DY+a039g6trdHLnkybsRESyF13oClA3660FlQ bMAbRf0Q7OVLq02sjBaUXB4acsVVjPIZ/2afiQVAtX+hCuSXYhUK6E+iG7noahHbByBoAl P7J5VoUAbN+HEGCjPI31z9SSjV3Hzg3dGKc6HMzRkfu8zFJxBL2Vu0IjigI9pSR1ozcB/6 O4gGDleF0JW0u7YPbFMo8Dwk0iQjAXC3qjvmMeg7/++2YMKM31gqmYwYX8/Su1yeihbLcH 8A1b8tXbYawp63t0LBAXmxjzfKI7PjzCNNAtk6dy2dpQzWpmiFw8KUzStsBNAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638806115; a=rsa-sha256; cv=none; b=M760TKaqbjliCONz9JTd4WQd4sjxz4EeetuuYTrT2N8ON7E6dGdh/93AlOoMH8gjx8efCZ Kkq3PVB7qhqzaOnS+Xmqph1aoQUqYikzIl49NwUFBUpSIcSXXW+2dB/BLLtmQ4YSbnpqQu kTG4gWarZi/okKXjb/MrdxvAoJKBf2JvEXvi34sb6Mg+t/qwd0m3d2DdIFYUazbcZeWsqQ fkh35JnINusgpNzmzJwUN8aoiirUvSBdekpt2DxP+OJ6JVmdFLe6UNhT1ejhvDlAosjynz 59QivKlQy5jJUaTVbD9nftmk7Z9cv8u4ylQvrs6tjj+NOAohNAh+ePEjvL+hkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3d23a13d229436f327bfe391d9eaa4767bbb5224 commit 3d23a13d229436f327bfe391d9eaa4767bbb5224 Author: Wuyang Chung AuthorDate: 2021-10-17 03:25:27 +0000 Commit: Warner Losh CommitDate: 2021-12-06 15:54:09 +0000 Correct the name of the second parameter of biowait to wmesg This parameter is passed directly to msleep, and the name of the msleep parameter is wmesg. Make them match. Pull Request: https://github.com/freebsd/freebsd-src/pull/557 (cherry picked from commit 8587d752558ccdfa3e3a9aa95f3af50304a973dc) --- sys/kern/vfs_bio.c | 4 ++-- sys/sys/bio.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index d58a13cf43e1..e1fb76ac6d35 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -4320,14 +4320,14 @@ biodone(struct bio *bp) * Wait for a BIO to finish. */ int -biowait(struct bio *bp, const char *wchan) +biowait(struct bio *bp, const char *wmesg) { struct mtx *mtxp; mtxp = mtx_pool_find(mtxpool_sleep, bp); mtx_lock(mtxp); while ((bp->bio_flags & BIO_DONE) == 0) - msleep(bp, mtxp, PRIBIO, wchan, 0); + msleep(bp, mtxp, PRIBIO, wmesg, 0); mtx_unlock(mtxp); if (bp->bio_error != 0) return (bp->bio_error); diff --git a/sys/sys/bio.h b/sys/sys/bio.h index 1dab615578ec..640d86ef134b 100644 --- a/sys/sys/bio.h +++ b/sys/sys/bio.h @@ -147,7 +147,7 @@ extern int bio_transient_maxcnt; void biodone(struct bio *bp); void biofinish(struct bio *bp, struct devstat *stat, int error); -int biowait(struct bio *bp, const char *wchan); +int biowait(struct bio *bp, const char *wmesg); #if defined(BUF_TRACKING) || defined(FULL_BUF_TRACKING) void biotrack_buf(struct bio *bp, const char *location);