diff options
| author |   cheloha <cheloha@openbsd.org> | 2019-07-19 00:54:58 +0000 |
|---|---|---|
| committer | cheloha <cheloha@openbsd.org> | 2019-07-19 00:54:58 +0000 |
| commit | 966bc0c5a553183ec638e79ba8ec95fb803b2ad6 (patch) | |
| tree | afb1e18419edfbf077c3b233ee22a92eb02e125b /sys/kern/vfs_subr.c | |
| parent | getblk(9): tsleep(9) -> tsleep_nsec(9); ok visa@ (diff) | |
| download | wireguard-openbsd-966bc0c5a553183ec638e79ba8ec95fb803b2ad6.tar.xz wireguard-openbsd-966bc0c5a553183ec638e79ba8ec95fb803b2ad6.zip | |
vwaitforio(9): tsleep(9) -> tsleep_nsec(9); ok visa@
Diffstat (limited to 'sys/kern/vfs_subr.c')
| -rw-r--r-- | sys/kern/vfs_subr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index a6ecfe2e92e..55ff411a6f1 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_subr.c,v 1.290 2019/06/28 13:25:09 visa Exp $ */ +/* $OpenBSD: vfs_subr.c,v 1.291 2019/07/19 00:54:59 cheloha Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* @@ -1858,7 +1858,7 @@ fs_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, * Manipulates v_numoutput. Must be called at splbio() */ int -vwaitforio(struct vnode *vp, int slpflag, char *wmesg, int timeo) +vwaitforio(struct vnode *vp, int slpflag, char *wmesg, uint64_t timeo) { int error = 0; @@ -1866,7 +1866,7 @@ vwaitforio(struct vnode *vp, int slpflag, char *wmesg, int timeo) while (vp->v_numoutput) { vp->v_bioflag |= VBIOWAIT; - error = tsleep(&vp->v_numoutput, + error = tsleep_nsec(&vp->v_numoutput, slpflag | (PRIBIO + 1), wmesg, timeo); if (error) break; @@ -1914,7 +1914,7 @@ vinvalbuf(struct vnode *vp, int flags, struct ucred *cred, struct proc *p, if (flags & V_SAVE) { s = splbio(); - vwaitforio(vp, 0, "vinvalbuf", 0); + vwaitforio(vp, 0, "vinvalbuf", INFSLP); if (!LIST_EMPTY(&vp->v_dirtyblkhd)) { splx(s); if ((error = VOP_FSYNC(vp, cred, MNT_WAIT, p)) != 0) @@ -2026,7 +2026,7 @@ loop: splx(s); return; } - vwaitforio(vp, 0, "vflushbuf", 0); + vwaitforio(vp, 0, "vflushbuf", INFSLP); if (!LIST_EMPTY(&vp->v_dirtyblkhd)) { splx(s); #ifdef DIAGNOSTIC |