diff options
| author |   cheloha <cheloha@openbsd.org> | 2019-07-19 00:24:31 +0000 |
|---|---|---|
| committer | cheloha <cheloha@openbsd.org> | 2019-07-19 00:24:31 +0000 |
| commit | 570df5c46ec138c3c01140bbdb153f33c5d6314c (patch) | |
| tree | 662107fcfc8e33d6b8a13855f7da2fe70dab336e /sys/kern | |
| parent | ttysleep(): drop unused timeout parameter (diff) | |
| download | wireguard-openbsd-570df5c46ec138c3c01140bbdb153f33c5d6314c.tar.xz wireguard-openbsd-570df5c46ec138c3c01140bbdb153f33c5d6314c.zip | |
getblk(9): tsleep(9) -> tsleep_nsec(9); ok visa@
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/vfs_bio.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 54c12251fa7..daaa31ea27a 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_bio.c,v 1.190 2019/05/09 15:09:40 beck Exp $ */ +/* $OpenBSD: vfs_bio.c,v 1.191 2019/07/19 00:24:31 cheloha Exp $ */ /* $NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $ */ /* @@ -432,7 +432,7 @@ bio_doread(struct vnode *vp, daddr_t blkno, int size, int async) struct buf *bp; struct mount *mp; - bp = getblk(vp, blkno, size, 0, 0); + bp = getblk(vp, blkno, size, 0, INFSLP); /* * If buffer does not have valid data, start a read. @@ -966,7 +966,8 @@ incore(struct vnode *vp, daddr_t blkno) * cached blocks be of the correct size. */ struct buf * -getblk(struct vnode *vp, daddr_t blkno, int size, int slpflag, int slptimeo) +getblk(struct vnode *vp, daddr_t blkno, int size, int slpflag, + uint64_t slptimeo) { struct buf *bp; struct buf b; @@ -989,8 +990,8 @@ start: if (bp != NULL) { if (ISSET(bp->b_flags, B_BUSY)) { SET(bp->b_flags, B_WANTED); - error = tsleep(bp, slpflag | (PRIBIO + 1), "getblk", - slptimeo); + error = tsleep_nsec(bp, slpflag | (PRIBIO + 1), + "getblk", slptimeo); splx(s); if (error) return (NULL); |