git: 3d23a13d2294 - stable/12 - Correct the name of the second parameter of biowait to wmesg
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 06 Dec 2021 15:55:14 UTC
The branch stable/12 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3d23a13d229436f327bfe391d9eaa4767bbb5224 commit 3d23a13d229436f327bfe391d9eaa4767bbb5224 Author: Wuyang Chung <wy-chung@outlook.com> AuthorDate: 2021-10-17 03:25:27 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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);