Convert them to tsleep_nsec(9), ok?
Index: kern/vfs_bio.c
===================================================================
RCS file: /cvs/src/sys/kern/vfs_bio.c,v
retrieving revision 1.193
diff -u -p -r1.193 vfs_bio.c
--- kern/vfs_bio.c 29 Nov 2019 01:04:08 -0000 1.193
+++ kern/vfs_bio.c 5 Dec 2019 10:45:00 -0000
@@ -1101,14 +1101,14 @@ buf_get(struct vnode *vp, daddr_t blkno,
curproc != syncerproc && curproc != cleanerproc) {
wakeup(&bd_req);
needbuffer++;
- tsleep(&needbuffer, PRIBIO, "needbuffer", 0);
+ tsleep_nsec(&needbuffer, PRIBIO, "needbuffer", INFSLP);
splx(s);
return (NULL);
}
if (bcstats.dmapages + npages > bufpages) {
/* cleaner or syncer */
nobuffers = 1;
- tsleep(&nobuffers, PRIBIO, "nobuffers", 0);
+ tsleep_nsec(&nobuffers, PRIBIO, "nobuffers", INFSLP);
splx(s);
return (NULL);
}
@@ -1191,7 +1191,7 @@ buf_daemon(void *arg)
needbuffer = 0;
wakeup(&needbuffer);
}
- tsleep(&bd_req, PRIBIO - 7, "cleaner", 0);
+ tsleep_nsec(&bd_req, PRIBIO - 7, "cleaner", INFSLP);
}
while ((bp = bufcache_getdirtybuf())) {
@@ -1247,7 +1247,7 @@ biowait(struct buf *bp)
s = splbio();
while (!ISSET(bp->b_flags, B_DONE))
- tsleep(bp, PRIBIO + 1, "biowait", 0);
+ tsleep_nsec(bp, PRIBIO + 1, "biowait", INFSLP);
splx(s);
/* check for interruption of I/O (e.g. via NFS), then errors. */
Index: kern/vfs_biomem.c
===================================================================
RCS file: /cvs/src/sys/kern/vfs_biomem.c,v
retrieving revision 1.46
diff -u -p -r1.46 vfs_biomem.c
--- kern/vfs_biomem.c 29 Nov 2019 22:10:04 -0000 1.46
+++ kern/vfs_biomem.c 5 Dec 2019 10:45:12 -0000
@@ -110,7 +110,8 @@ buf_map(struct buf *bp)
bcstats.kvaslots_avail <= RESERVE_SLOTS) ||
vbp == NULL) {
buf_needva++;
- tsleep(&buf_needva, PRIBIO, "buf_needva", 0);
+ tsleep_nsec(&buf_needva, PRIBIO, "buf_needva",
+ INFSLP);
vbp = TAILQ_FIRST(&buf_valist);
}
va = buf_unmap(vbp);
Index: kern/vfs_default.c
===================================================================
RCS file: /cvs/src/sys/kern/vfs_default.c,v
retrieving revision 1.43
diff -u -p -r1.43 vfs_default.c
--- kern/vfs_default.c 10 Jan 2017 19:48:32 -0000 1.43
+++ kern/vfs_default.c 5 Dec 2019 10:45:22 -0000
@@ -88,8 +88,7 @@ vop_generic_revoke(void *v)
*/
if (vp->v_flag & VXLOCK) {
vp->v_flag |= VXWANT;
- tsleep(vp, PINOD, "vop_generic_revokeall", 0);
-
+ tsleep_nsec(vp, PINOD, "vop_generic_revokeall", INFSLP);
return(0);
}
Index: kern/vfs_subr.c
===================================================================
RCS file: /cvs/src/sys/kern/vfs_subr.c,v
retrieving revision 1.293
diff -u -p -r1.293 vfs_subr.c
--- kern/vfs_subr.c 26 Aug 2019 18:56:29 -0000 1.293
+++ kern/vfs_subr.c 5 Dec 2019 10:45:37 -0000
@@ -652,7 +652,7 @@ vget(struct vnode *vp, int flags)
}
vp->v_flag |= VXWANT;
- tsleep(vp, PINOD, "vget", 0);
+ tsleep_nsec(vp, PINOD, "vget", INFSLP);
return (ENOENT);
}
@@ -1104,7 +1104,7 @@ vgonel(struct vnode *vp, struct proc *p)
*/
if (vp->v_flag & VXLOCK) {
vp->v_flag |= VXWANT;
- tsleep(vp, PINOD, "vgone", 0);
+ tsleep_nsec(vp, PINOD, "vgone", INFSLP);
return;
}
Index: kern/vfs_sync.c
===================================================================
RCS file: /cvs/src/sys/kern/vfs_sync.c,v
retrieving revision 1.60
diff -u -p -r1.60 vfs_sync.c
--- kern/vfs_sync.c 13 Aug 2018 15:26:17 -0000 1.60
+++ kern/vfs_sync.c 5 Dec 2019 10:45:43 -0000
@@ -229,7 +229,7 @@ syncer_thread(void *arg)
* filesystem activity.
*/
if (time_second == starttime)
- tsleep(&lbolt, PPAUSE, "syncer", 0);
+ tsleep_nsec(&lbolt, PPAUSE, "syncer", INFSLP);
}
}
Index: kern/vfs_vnops.c
===================================================================
RCS file: /cvs/src/sys/kern/vfs_vnops.c,v
retrieving revision 1.109
diff -u -p -r1.109 vfs_vnops.c
--- kern/vfs_vnops.c 10 Nov 2019 05:00:36 -0000 1.109
+++ kern/vfs_vnops.c 5 Dec 2019 10:45:50 -0000
@@ -564,7 +564,7 @@ vn_lock(struct vnode *vp, int flags)
do {
if (vp->v_flag & VXLOCK) {
vp->v_flag |= VXWANT;
- tsleep(vp, PINOD, "vn_lock", 0);
+ tsleep_nsec(vp, PINOD, "vn_lock", INFSLP);
error = ENOENT;
} else {
vp->v_lockcount++;
Index: kern/vfs_vops.c
===================================================================
RCS file: /cvs/src/sys/kern/vfs_vops.c,v
retrieving revision 1.22
diff -u -p -r1.22 vfs_vops.c
--- kern/vfs_vops.c 26 Aug 2019 18:56:29 -0000 1.22
+++ kern/vfs_vops.c 5 Dec 2019 10:46:02 -0000
@@ -607,7 +607,7 @@ VOP_LOCK(struct vnode *vp, int flags)
* before continuing.
*/
KASSERT(vp->v_flag & VXLOCK);
- tsleep(&vp->v_lockcount, PINOD, "vop_lock", 0);
+ tsleep_nsec(&vp->v_lockcount, PINOD, "vop_lock", INFSLP);
KASSERT(vp->v_lockcount == 0);
}
