From nobody Mon Dec 06 15:56:23 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 6A47618C56AE; Mon, 6 Dec 2021 15:56:27 +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 4J77MY1W33z4bfx; Mon, 6 Dec 2021 15:56:25 +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 6587D6856; Mon, 6 Dec 2021 15:56:23 +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 1B6FuNuL033463; Mon, 6 Dec 2021 15:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6FuNof033462; Mon, 6 Dec 2021 15:56:23 GMT (envelope-from git) Date: Mon, 6 Dec 2021 15:56:23 GMT Message-Id: <202112061556.1B6FuNof033462@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: 815c26d4e1b3 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 815c26d4e1b398eedca48706adcf87e31f7d0a9b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638806185; 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=vHIP6Y2GOznLe3PX7Le2GIH5iDUdPjh8lUIsSWFpwOE=; b=vTKiRlUur0MGryJeYgFEsGL0ZQYmslyDib88YomRMYpikIGa273k+mvtWWPiT6WTk2IiT2 MbXtHbEz6eu6g4Dpdgvyy1/qEm6nsB5f8mNFwFLk3YdIR6kTmWDwv/Jf6yMPTGO0VwAWq7 ytI58ApMGZhOjosnLE025w1OIFdjFoESAdMVxgCDNSyv5AiOrB4UFx2zxap8vCZNwb8qXY qZOi9UcNlXTujI3ZHOANL4xunQHJG5VODtKR/sT5Nom5MJzPhDdmPRaADb089rYWiSH1SI bXBQCziLl3xS1OMaLGXNsV0TDQ4XR5AReT5T8e0vabenrIytWqBUgiucHq4F1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638806186; a=rsa-sha256; cv=none; b=hgaQfhrqlpxGBsOCVPDuncf9iTZZH5//N5sOvMsChQcLv+l7QVyPBjMUEGB6TM3xQZIW/G ru4eXsRWJTUu3FqECNZlbnTrp7gcPMQJcR1BAmYp8YtrAFTS9h135MucLG9rioFs6llS0l 805x5afOsikQibRz81WskTbFRZd2hp3+ZuRjQ7CIVe02eF8F3DITvimT/gdxZtGspAdwV5 BF1kx2OYUpqr5R6M+MeCHHKgGYrWC+954cCOJlvpRuh6R/OUywCJOjMgJ/6a62nUe8A2lw m+oFity51bzKSc3cyXxLlKhyHXy4EcEFeQVPzKonjgCesrXQdD5IlaxgG1y7wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=815c26d4e1b398eedca48706adcf87e31f7d0a9b commit 815c26d4e1b398eedca48706adcf87e31f7d0a9b Author: Wuyang Chung AuthorDate: 2021-10-17 03:25:27 +0000 Commit: Warner Losh CommitDate: 2021-12-06 15:55:55 +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 d32cad8a7fd5..dc470512a066 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -4395,14 +4395,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 5fdf0ecbb917..88eeea427da3 100644 --- a/sys/sys/bio.h +++ b/sys/sys/bio.h @@ -151,7 +151,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);