getblk(9): tsleep(9) -> tsleep_nsec(9); ok visa@

10 files changed, 39 insertions, 39 deletions

diff --git a/sys/ufs/ext2fs/ext2fs_balloc.c b/sys/ufs/ext2fs/ext2fs_balloc.c
index 99f42cc7afc..b615739e460 100644
--- a/sys/ufs/ext2fs/ext2fs_balloc.c
+++ b/sys/ufs/ext2fs/ext2fs_balloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_balloc.c,v 1.26 2016/06/03 18:00:10 natano Exp $	*/
+/*	$OpenBSD: ext2fs_balloc.c,v 1.27 2019/07/19 00:24:31 cheloha Exp $	*/
 /*	$NetBSD: ext2fs_balloc.c,v 1.10 2001/07/04 21:16:01 chs Exp $	*/
 
 /*
@@ -97,7 +97,7 @@ ext2fs_buf_alloc(struct inode *ip, u_int32_t bn, int size, struct ucred *cred,
 		ip->i_e2fs_last_blk = newb;
 		ip->i_e2fs_blocks[bn] = htole32(newb);
 		ip->i_flag |= IN_CHANGE | IN_UPDATE;
-		bp = getblk(vp, bn, fs->e2fs_bsize, 0, 0);
+		bp = getblk(vp, bn, fs->e2fs_bsize, 0, INFSLP);
 		bp->b_blkno = fsbtodb(fs, newb);
 		if (flags & B_CLRBUF)
 			clrbuf(bp);
@@ -129,7 +129,7 @@ ext2fs_buf_alloc(struct inode *ip, u_int32_t bn, int size, struct ucred *cred,
 		nb = newb;
 		*allocblk++ = nb;
 		ip->i_e2fs_last_blk = newb;
-		bp = getblk(vp, indirs[1].in_lbn, fs->e2fs_bsize, 0, 0);
+		bp = getblk(vp, indirs[1].in_lbn, fs->e2fs_bsize, 0, INFSLP);
 		bp->b_blkno = fsbtodb(fs, newb);
 		clrbuf(bp);
 		/*
@@ -170,7 +170,7 @@ ext2fs_buf_alloc(struct inode *ip, u_int32_t bn, int size, struct ucred *cred,
 		nb = newb;
 		*allocblk++ = nb;
 		ip->i_e2fs_last_blk = newb;
-		nbp = getblk(vp, indirs[i].in_lbn, fs->e2fs_bsize, 0, 0);
+		nbp = getblk(vp, indirs[i].in_lbn, fs->e2fs_bsize, 0, INFSLP);
 		nbp->b_blkno = fsbtodb(fs, nb);
 		clrbuf(nbp);
 		/*
@@ -218,7 +218,7 @@ ext2fs_buf_alloc(struct inode *ip, u_int32_t bn, int size, struct ucred *cred,
 		} else {
 			bdwrite(bp);
 		}
-		nbp = getblk(vp, lbn, fs->e2fs_bsize, 0, 0);
+		nbp = getblk(vp, lbn, fs->e2fs_bsize, 0, INFSLP);
 		nbp->b_blkno = fsbtodb(fs, nb);
 		if (flags & B_CLRBUF)
 			clrbuf(nbp);
@@ -233,7 +233,7 @@ ext2fs_buf_alloc(struct inode *ip, u_int32_t bn, int size, struct ucred *cred,
 			goto fail;
 		}
 	} else {
-		nbp = getblk(vp, lbn, fs->e2fs_bsize, 0, 0);
+		nbp = getblk(vp, lbn, fs->e2fs_bsize, 0, INFSLP);
 		nbp->b_blkno = fsbtodb(fs, nb);
 	}
 
@@ -269,7 +269,7 @@ fail:
 		}
 		for (i = unwindidx + 1; i <= num; i++) {
 			bp = getblk(vp, indirs[i].in_lbn, (int)fs->e2fs_bsize,
-			    0, 0);
+			    0, INFSLP);
 			bp->b_flags |= B_INVAL;
 			brelse(bp);
 		}
diff --git a/sys/ufs/ext2fs/ext2fs_bmap.c b/sys/ufs/ext2fs/ext2fs_bmap.c
index 11a695aa5c1..3311e1b76bb 100644
--- a/sys/ufs/ext2fs/ext2fs_bmap.c
+++ b/sys/ufs/ext2fs/ext2fs_bmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_bmap.c,v 1.26 2015/03/14 03:38:52 jsg Exp $	*/
+/*	$OpenBSD: ext2fs_bmap.c,v 1.27 2019/07/19 00:24:31 cheloha Exp $	*/
 /*	$NetBSD: ext2fs_bmap.c,v 1.5 2000/03/30 12:41:11 augustss Exp $	*/
 
 /*
@@ -215,7 +215,7 @@ ext2fs_bmaparray(struct vnode *vp, daddr_t bn, daddr_t *bnp,
 			brelse(bp);
 
 		xap->in_exists = 1;
-		bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, 0);
+		bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, INFSLP);
 		if (bp->b_flags & (B_DONE | B_DELWRI)) {
 			;
 		}
diff --git a/sys/ufs/ext2fs/ext2fs_inode.c b/sys/ufs/ext2fs/ext2fs_inode.c
index 6777333bc2b..d8398c76c8c 100644
--- a/sys/ufs/ext2fs/ext2fs_inode.c
+++ b/sys/ufs/ext2fs/ext2fs_inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_inode.c,v 1.60 2019/07/01 05:11:32 kevlo Exp $	*/
+/*	$OpenBSD: ext2fs_inode.c,v 1.61 2019/07/19 00:24:31 cheloha Exp $	*/
 /*	$NetBSD: ext2fs_inode.c,v 1.24 2001/06/19 12:59:18 wiz Exp $	*/
 
 /*
@@ -448,7 +448,7 @@ ext2fs_indirtrunc(struct inode *ip, int32_t lbn, int32_t dbn, int32_t lastbn, in
 	 * explicitly instead of letting bread do everything for us.
 	 */
 	vp = ITOV(ip);
-	bp = getblk(vp, lbn, (int)fs->e2fs_bsize, 0, 0);
+	bp = getblk(vp, lbn, (int)fs->e2fs_bsize, 0, INFSLP);
 	if (!(bp->b_flags & (B_DONE | B_DELWRI))) {
 		curproc->p_ru.ru_inblock++;		/* pay for read */
 		bcstats.pendingreads++;
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c
index 35173dcccaf..83705f6fb03 100644
--- a/sys/ufs/ext2fs/ext2fs_vfsops.c
+++ b/sys/ufs/ext2fs/ext2fs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_vfsops.c,v 1.111 2019/07/01 05:11:32 kevlo Exp $	*/
+/*	$OpenBSD: ext2fs_vfsops.c,v 1.112 2019/07/19 00:24:31 cheloha Exp $	*/
 /*	$NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $	*/
 
 /*
@@ -1035,7 +1035,7 @@ ext2fs_sbupdate(struct ufsmount *mp, int waitfor)
 	struct buf *bp;
 	int error = 0;
 
-	bp = getblk(mp->um_devvp, SBLOCK, SBSIZE, 0, 0);
+	bp = getblk(mp->um_devvp, SBLOCK, SBSIZE, 0, INFSLP);
 	e2fs_sbsave(&fs->e2fs, (struct ext2fs *) bp->b_data);
 	if (waitfor == MNT_WAIT)
 		error = bwrite(bp);
@@ -1055,7 +1055,7 @@ ext2fs_cgupdate(struct ufsmount *mp, int waitfor)
 	allerror = ext2fs_sbupdate(mp, waitfor);
 	for (i = 0; i < fs->e2fs_ngdb; i++) {
 		bp = getblk(mp->um_devvp, fsbtodb(fs, ((fs->e2fs_bsize>1024)?0:1)+i+1),
-		    fs->e2fs_bsize, 0, 0);
+		    fs->e2fs_bsize, 0, INFSLP);
 		e2fs_cgsave(&fs->e2fs_gd[i* fs->e2fs_bsize / sizeof(struct ext2_gd)], (struct ext2_gd*)bp->b_data, fs->e2fs_bsize);
 		if (waitfor == MNT_WAIT)
 			error = bwrite(bp);
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 7c6bc8c27ff..dd2207eab8e 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_alloc.c,v 1.108 2016/05/23 20:47:49 tb Exp $	*/
+/*	$OpenBSD: ffs_alloc.c,v 1.109 2019/07/19 00:24:31 cheloha Exp $	*/
 /*	$NetBSD: ffs_alloc.c,v 1.11 1996/05/11 18:27:09 mycroft Exp $	*/
 
 /*
@@ -1191,7 +1191,7 @@ gotit:
 
                 ibp = getblk(ip->i_devvp, fsbtodb(fs,
                     ino_to_fsba(fs, cg * fs->fs_ipg + cgp->cg_initediblk)),
-                    (int)fs->fs_bsize, 0, 0);
+                    (int)fs->fs_bsize, 0, INFSLP);
 
                 memset(ibp->b_data, 0, fs->fs_bsize);
                 dp2 = (struct ufs2_dinode *)(ibp->b_data);
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index ca1c80d804b..ce94cffc700 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_balloc.c,v 1.44 2015/11/28 21:52:02 beck Exp $	*/
+/*	$OpenBSD: ffs_balloc.c,v 1.45 2019/07/19 00:24:31 cheloha Exp $	*/
 /*	$NetBSD: ffs_balloc.c,v 1.3 1996/02/09 22:22:21 christos Exp $	*/
 
 /*
@@ -200,7 +200,7 @@ ffs1_balloc(struct inode *ip, off_t startoffset, int size, struct ucred *cred,
 			if (error)
 				return (error);
 			if (bpp != NULL) {
-				*bpp = getblk(vp, lbn, fs->fs_bsize, 0, 0);
+				*bpp = getblk(vp, lbn, fs->fs_bsize, 0, INFSLP);
 				if (nsize < fs->fs_bsize)
 					(*bpp)->b_bcount = nsize;
 				(*bpp)->b_blkno = fsbtodb(fs, newb);
@@ -243,7 +243,7 @@ ffs1_balloc(struct inode *ip, off_t startoffset, int size, struct ucred *cred,
 		nb = newb;
 
 		*allocblk++ = nb;
-		bp = getblk(vp, indirs[1].in_lbn, fs->fs_bsize, 0, 0);
+		bp = getblk(vp, indirs[1].in_lbn, fs->fs_bsize, 0, INFSLP);
 		bp->b_blkno = fsbtodb(fs, nb);
 		clrbuf(bp);
 
@@ -292,7 +292,7 @@ ffs1_balloc(struct inode *ip, off_t startoffset, int size, struct ucred *cred,
 		}
 		nb = newb;
 		*allocblk++ = nb;
-		nbp = getblk(vp, indirs[i].in_lbn, fs->fs_bsize, 0, 0);
+		nbp = getblk(vp, indirs[i].in_lbn, fs->fs_bsize, 0, INFSLP);
 		nbp->b_blkno = fsbtodb(fs, nb);
 		clrbuf(nbp);
 
@@ -337,7 +337,7 @@ ffs1_balloc(struct inode *ip, off_t startoffset, int size, struct ucred *cred,
 		nb = newb;
 		*allocblk++ = nb;
 		if (bpp != NULL) {
-			nbp = getblk(vp, lbn, fs->fs_bsize, 0, 0);
+			nbp = getblk(vp, lbn, fs->fs_bsize, 0, INFSLP);
 			nbp->b_blkno = fsbtodb(fs, nb);
 			if (flags & B_CLRBUF)
 				clrbuf(nbp);
@@ -367,7 +367,7 @@ ffs1_balloc(struct inode *ip, off_t startoffset, int size, struct ucred *cred,
 				goto fail;
 			}
 		} else {
-			nbp = getblk(vp, lbn, fs->fs_bsize, 0, 0);
+			nbp = getblk(vp, lbn, fs->fs_bsize, 0, INFSLP);
 			nbp->b_blkno = fsbtodb(fs, nb);
 		}
 		*bpp = nbp;
@@ -572,7 +572,7 @@ ffs2_balloc(struct inode *ip, off_t off, int size, struct ucred *cred,
 				return (error);
 
 			if (bpp != NULL) {
-				bp = getblk(vp, lbn, fs->fs_bsize, 0, 0);
+				bp = getblk(vp, lbn, fs->fs_bsize, 0, INFSLP);
 				if (nsize < fs->fs_bsize)
 					bp->b_bcount = nsize;
 				bp->b_blkno = fsbtodb(fs, newb);
@@ -622,7 +622,7 @@ ffs2_balloc(struct inode *ip, off_t off, int size, struct ucred *cred,
 
 		nb = newb;
 		*allocblk++ = nb;
-		bp = getblk(vp, indirs[1].in_lbn, fs->fs_bsize, 0, 0);
+		bp = getblk(vp, indirs[1].in_lbn, fs->fs_bsize, 0, INFSLP);
 		bp->b_blkno = fsbtodb(fs, nb);
 		clrbuf(bp);
 
@@ -681,7 +681,7 @@ ffs2_balloc(struct inode *ip, off_t off, int size, struct ucred *cred,
 
 		nb = newb;
 		*allocblk++ = nb;
-		nbp = getblk(vp, indirs[i].in_lbn, fs->fs_bsize, 0, 0);
+		nbp = getblk(vp, indirs[i].in_lbn, fs->fs_bsize, 0, INFSLP);
 		nbp->b_blkno = fsbtodb(fs, nb);
 		clrbuf(nbp);
 
@@ -733,7 +733,7 @@ ffs2_balloc(struct inode *ip, off_t off, int size, struct ucred *cred,
 		*allocblk++ = nb;
 
 		if (bpp != NULL) {
-			nbp = getblk(vp, lbn, fs->fs_bsize, 0, 0);
+			nbp = getblk(vp, lbn, fs->fs_bsize, 0, INFSLP);
 			nbp->b_blkno = fsbtodb(fs, nb);
 			if (flags & B_CLRBUF)
 				clrbuf(nbp);
@@ -771,7 +771,7 @@ ffs2_balloc(struct inode *ip, off_t off, int size, struct ucred *cred,
 				goto fail;
 			}
 		} else {
-			nbp = getblk(vp, lbn, fs->fs_bsize, 0, 0);
+			nbp = getblk(vp, lbn, fs->fs_bsize, 0, INFSLP);
 			nbp->b_blkno = fsbtodb(fs, nb);
 			clrbuf(nbp);
 		}
@@ -811,13 +811,13 @@ fail:
 				break;
 
 			bp = getblk(vp, indirs[i].in_lbn, (int) fs->fs_bsize,
-			    0, 0);
+			    0, INFSLP);
 			if (bp->b_flags & B_DELWRI) {
 				nb = fsbtodb(fs, cgtod(fs, dtog(fs,
 				    dbtofsb(fs, bp->b_blkno))));
 				bwrite(bp);
 				bp = getblk(ip->i_devvp, nb,
-				    (int) fs->fs_cgsize, 0, 0);
+				    (int) fs->fs_cgsize, 0, INFSLP);
 				if (bp->b_flags & B_DELWRI)
 					bwrite(bp);
 				else {
@@ -857,7 +857,7 @@ fail:
 
 		for (i = unwindidx + 1; i <= num; i++) {
 			bp = getblk(vp, indirs[i].in_lbn, (int)fs->fs_bsize, 0,
-			    0);
+			    INFSLP);
 			bp->b_flags |= B_INVAL;
 			brelse(bp);
 		}
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 686de3a5dcb..3c5cfe35cf5 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_inode.c,v 1.78 2019/06/18 07:33:24 anton Exp $	*/
+/*	$OpenBSD: ffs_inode.c,v 1.79 2019/07/19 00:24:31 cheloha Exp $	*/
 /*	$NetBSD: ffs_inode.c,v 1.10 1996/05/11 18:27:19 mycroft Exp $	*/
 
 /*
@@ -479,7 +479,7 @@ ffs_indirtrunc(struct inode *ip, daddr_t lbn, daddr_t dbn,
 	 * explicitly instead of letting bread do everything for us.
 	 */
 	vp = ITOV(ip);
-	bp = getblk(vp, lbn, (int)fs->fs_bsize, 0, 0);
+	bp = getblk(vp, lbn, (int)fs->fs_bsize, 0, INFSLP);
 	if (!(bp->b_flags & (B_DONE | B_DELWRI))) {
 		curproc->p_ru.ru_inblock++;		/* pay for read */
 		bcstats.pendingreads++;
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index c8ee770d2b6..edf206c1713 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_softdep.c,v 1.143 2018/07/02 20:56:22 bluhm Exp $	*/
+/*	$OpenBSD: ffs_softdep.c,v 1.144 2019/07/19 00:24:31 cheloha Exp $	*/
 
 /*
  * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -1850,7 +1850,7 @@ setup_allocindir_phase2(struct buf *bp, struct inode *ip,
 				NULL);
 		}
 		newindirdep->ir_savebp =
-		    getblk(ip->i_devvp, bp->b_blkno, bp->b_bcount, 0, 0);
+		    getblk(ip->i_devvp, bp->b_blkno, bp->b_bcount, 0, INFSLP);
 #if 0
 		BUF_KERNPROC(newindirdep->ir_savebp);
 #endif
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 41532f35faf..2d3538088d0 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_vfsops.c,v 1.179 2018/09/26 14:51:44 visa Exp $	*/
+/*	$OpenBSD: ffs_vfsops.c,v 1.180 2019/07/19 00:24:32 cheloha Exp $	*/
 /*	$NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $	*/
 
 /*
@@ -1498,7 +1498,7 @@ ffs_sbupdate(struct ufsmount *mp, int waitfor)
 		if (i + fs->fs_frag > blks)
 			size = (blks - i) * fs->fs_fsize;
 		bp = getblk(mp->um_devvp, fsbtodb(fs, fs->fs_csaddr + i),
-			    size, 0, 0);
+		    size, 0, INFSLP);
 		memcpy(bp->b_data, space, size);
 		space += size;
 		if (waitfor != MNT_WAIT)
@@ -1518,7 +1518,7 @@ ffs_sbupdate(struct ufsmount *mp, int waitfor)
 
 	bp = getblk(mp->um_devvp,
 	    fs->fs_sblockloc >> (fs->fs_fshift - fs->fs_fsbtodb),
-	    (int)fs->fs_sbsize, 0, 0);
+	    (int)fs->fs_sbsize, 0, INFSLP);
 	fs->fs_fmod = 0;
 	fs->fs_time = time_second;
 	memcpy(bp->b_data, fs, fs->fs_sbsize);
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 858f5fceb65..d7034ed1a10 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_bmap.c,v 1.35 2015/03/14 03:38:53 jsg Exp $	*/
+/*	$OpenBSD: ufs_bmap.c,v 1.36 2019/07/19 00:24:32 cheloha Exp $	*/
 /*	$NetBSD: ufs_bmap.c,v 1.3 1996/02/09 22:36:00 christos Exp $	*/
 
 /*
@@ -160,7 +160,7 @@ ufs_bmaparray(struct vnode *vp, daddr_t bn, daddr_t *bnp, struct indir *ap,
 			brelse(bp);
 
 		xap->in_exists = 1;
-		bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, 0);
+		bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, INFSLP);
 		if (bp->b_flags & (B_DONE | B_DELWRI)) {
 			;
 		}