Convert them to tsleep_nsec(9), ok?
Index: kern/subr_extent.c
===================================================================
RCS file: /cvs/src/sys/kern/subr_extent.c,v
retrieving revision 1.62
diff -u -p -r1.62 subr_extent.c
--- kern/subr_extent.c 11 Sep 2019 12:30:34 -0000 1.62
+++ kern/subr_extent.c 10 Jan 2020 12:16:02 -0000
@@ -58,7 +58,7 @@
#define malloc(s, t, flags) malloc(s)
#define free(p, t, s) free(p)
-#define tsleep(chan, pri, str, timo) (EWOULDBLOCK)
+#define tsleep_nsec(c, p, s, t) (EWOULDBLOCK)
#define wakeup(chan) ((void)0)
struct pool {
@@ -489,9 +489,9 @@ extent_alloc_region(struct extent *ex, u
*/
if (flags & EX_WAITSPACE) {
ex->ex_flags |= EXF_WANTED;
- error = tsleep(ex,
+ error = tsleep_nsec(ex,
PRIBIO | ((flags & EX_CATCH) ? PCATCH : 0),
- "extnt", 0);
+ "extnt", INFSLP);
if (error)
return (error);
goto alloc_start;
@@ -901,8 +901,9 @@ skip:
*/
if (flags & EX_WAITSPACE) {
ex->ex_flags |= EXF_WANTED;
- error = tsleep(ex,
- PRIBIO | ((flags & EX_CATCH) ? PCATCH : 0), "extnt", 0);
+ error = tsleep_nsec(ex,
+ PRIBIO | ((flags & EX_CATCH) ? PCATCH : 0),
+ "extnt", INFSLP);
if (error)
return (error);
goto alloc_start;
@@ -1140,9 +1141,9 @@ extent_alloc_region_descriptor(struct ex
if ((flags & EX_WAITOK) == 0)
return (NULL);
ex->ex_flags |= EXF_FLWANTED;
- if (tsleep(&fex->fex_freelist,
+ if (tsleep_nsec(&fex->fex_freelist,
PRIBIO | ((flags & EX_CATCH) ? PCATCH : 0),
- "extnt", 0))
+ "extnt", INFSLP))
return (NULL);
}
rp = LIST_FIRST(&fex->fex_freelist);
Index: kern/subr_log.c
===================================================================
RCS file: /cvs/src/sys/kern/subr_log.c,v
retrieving revision 1.63
diff -u -p -r1.63 subr_log.c
--- kern/subr_log.c 8 Jan 2020 16:27:41 -0000 1.63
+++ kern/subr_log.c 10 Jan 2020 12:18:41 -0000
@@ -205,8 +205,7 @@ logread(dev_t dev, struct uio *uio, int
goto out;
}
logsoftc.sc_state |= LOG_RDWAIT;
- error = tsleep(mbp, LOG_RDPRI | PCATCH,
- "klog", 0);
+ error = tsleep_nsec(mbp, LOG_RDPRI | PCATCH, "klog", INFSLP);
if (error)
goto out;
}
Index: kern/tty_pty.c
===================================================================
RCS file: /cvs/src/sys/kern/tty_pty.c,v
retrieving revision 1.95
diff -u -p -r1.95 tty_pty.c
--- kern/tty_pty.c 31 Dec 2019 13:48:32 -0000 1.95
+++ kern/tty_pty.c 10 Jan 2020 12:18:04 -0000
@@ -477,8 +477,8 @@ ptcread(dev_t dev, struct uio *uio, int
return (0); /* EOF */
if (flag & IO_NDELAY)
return (EWOULDBLOCK);
- error = tsleep(&tp->t_outq.c_cf, TTIPRI | PCATCH,
- ttyin, 0);
+ error = tsleep_nsec(&tp->t_outq.c_cf, TTIPRI | PCATCH, ttyin,
+ INFSLP);
if (error)
return (error);
}
@@ -587,8 +587,7 @@ block:
error = EWOULDBLOCK;
goto done;
}
- error = tsleep(&tp->t_rawq.c_cf, TTOPRI | PCATCH,
- ttyout, 0);
+ error = tsleep_nsec(&tp->t_rawq.c_cf, TTOPRI | PCATCH, ttyout, INFSLP);
if (error == 0)
goto again;
