Date: Fri, 19 Nov 2021 06:27:48 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 8587d752558c - main - Correct the name of the second parameter of biowait to wmesg Message-ID: <202111190627.1AJ6RmbK083156@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8587d752558ccdfa3e3a9aa95f3af50304a973dc commit 8587d752558ccdfa3e3a9aa95f3af50304a973dc Author: Wuyang Chung <wy-chung@outlook.com> AuthorDate: 2021-10-17 03:25:27 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-11-19 06:26:33 +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 --- 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 2b89490ce618..4b746a269171 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -4403,14 +4403,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 fba1b9dce68f..90430b1e7099 100644 --- a/sys/sys/bio.h +++ b/sys/sys/bio.h @@ -152,7 +152,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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111190627.1AJ6RmbK083156>