vinvalbuf(9): tlseep -> tsleep_nsec(9); ok millert@

5 files changed, 17 insertions, 16 deletions

diff --git a/sys/ufs/ext2fs/ext2fs_inode.c b/sys/ufs/ext2fs/ext2fs_inode.c
index d8398c76c8c..dd025156d5e 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.61 2019/07/19 00:24:31 cheloha Exp $	*/
+/*	$OpenBSD: ext2fs_inode.c,v 1.62 2019/07/25 01:43:21 cheloha Exp $	*/
 /*	$NetBSD: ext2fs_inode.c,v 1.24 2001/06/19 12:59:18 wiz Exp $	*/
 
 /*
@@ -341,7 +341,7 @@ ext2fs_truncate(struct inode *oip, off_t length, int flags, struct ucred *cred)
 	memcpy(&oip->i_e2fs_blocks[0], oldblks, sizeof(oldblks));
 	(void)ext2fs_setsize(oip, osize);
 	vflags = ((length > 0) ? V_SAVE : 0) | V_SAVEMETA;
-	allerror = vinvalbuf(ovp, vflags, cred, curproc, 0, 0);
+	allerror = vinvalbuf(ovp, vflags, cred, curproc, 0, INFSLP);
 
 	/*
 	 * Indirect blocks first.
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c
index 83705f6fb03..975104af0b2 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.112 2019/07/19 00:24:31 cheloha Exp $	*/
+/*	$OpenBSD: ext2fs_vfsops.c,v 1.113 2019/07/25 01:43:21 cheloha Exp $	*/
 /*	$NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $	*/
 
 /*
@@ -319,7 +319,7 @@ ext2fs_reload_vnode(struct vnode *vp, void *args)
 	if (vget(vp, LK_EXCLUSIVE))
 		return (0);
 
-	if (vinvalbuf(vp, 0, era->cred, era->p, 0, 0))
+	if (vinvalbuf(vp, 0, era->cred, era->p, 0, INFSLP))
 		panic("ext2fs_reload: dirty2");
 	/*
 	 * Step 6: re-read inode data for all active vnodes.
@@ -442,7 +442,7 @@ ext2fs_reload(struct mount *mountp, struct ucred *cred, struct proc *p)
 	 */
 	devvp = VFSTOUFS(mountp)->um_devvp;
 	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
-	error = vinvalbuf(devvp, 0, cred, p, 0, 0);
+	error = vinvalbuf(devvp, 0, cred, p, 0, INFSLP);
 	VOP_UNLOCK(devvp);
 	if (error != 0)
 		panic("ext2fs_reload: dirty1");
@@ -507,7 +507,7 @@ ext2fs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p)
 	if (vcount(devvp) > 1 && devvp != rootvp)
 		return (EBUSY);
 	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
-	error = vinvalbuf(devvp, V_SAVE, cred, p, 0, 0);
+	error = vinvalbuf(devvp, V_SAVE, cred, p, 0, INFSLP);
 	VOP_UNLOCK(devvp);
 	if (error != 0)
 		return (error);
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 3c5cfe35cf5..11a24acbcbb 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.79 2019/07/19 00:24:31 cheloha Exp $	*/
+/*	$OpenBSD: ffs_inode.c,v 1.80 2019/07/25 01:43:21 cheloha Exp $	*/
 /*	$NetBSD: ffs_inode.c,v 1.10 1996/05/11 18:27:19 mycroft Exp $	*/
 
 /*
@@ -194,7 +194,7 @@ ffs_truncate(struct inode *oip, off_t length, int flags, struct ucred *cred)
 			(void)ufs_quota_free_blocks(oip, DIP(oip, blocks),
 			    NOCRED);
 			softdep_setup_freeblocks(oip, length);
-			(void) vinvalbuf(ovp, 0, cred, curproc, 0, 0);
+			vinvalbuf(ovp, 0, cred, curproc, 0, INFSLP);
 			oip->i_flag |= IN_CHANGE | IN_UPDATE;
 			return (UFS_UPDATE(oip, 0));
 		}
@@ -323,7 +323,7 @@ ffs_truncate(struct inode *oip, off_t length, int flags, struct ucred *cred)
 
 	DIP_ASSIGN(oip, size, osize);
 	vflags = ((length > 0) ? V_SAVE : 0) | V_SAVEMETA;
-	allerror = vinvalbuf(ovp, vflags, cred, curproc, 0, 0);
+	allerror = vinvalbuf(ovp, vflags, cred, curproc, 0, INFSLP);
 
 	/*
 	 * Indirect blocks first.
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 2d3538088d0..00b818bad97 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.180 2019/07/19 00:24:32 cheloha Exp $	*/
+/*	$OpenBSD: ffs_vfsops.c,v 1.181 2019/07/25 01:43:21 cheloha Exp $	*/
 /*	$NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $	*/
 
 /*
@@ -516,7 +516,7 @@ ffs_reload_vnode(struct vnode *vp, void *args)
 	if (vget(vp, LK_EXCLUSIVE))
 		return (0);
 
-	if (vinvalbuf(vp, 0, fra->cred, fra->p, 0, 0))
+	if (vinvalbuf(vp, 0, fra->cred, fra->p, 0, INFSLP))
 		panic("ffs_reload: dirty2");
 
 	/*
@@ -572,7 +572,7 @@ ffs_reload(struct mount *mountp, struct ucred *cred, struct proc *p)
 	 */
 	devvp = VFSTOUFS(mountp)->um_devvp;
 	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
-	error = vinvalbuf(devvp, 0, cred, p, 0, 0);
+	error = vinvalbuf(devvp, 0, cred, p, 0, INFSLP);
 	VOP_UNLOCK(devvp);
 	if (error)
 		panic("ffs_reload: dirty1");
@@ -718,7 +718,7 @@ ffs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p)
 	if (vcount(devvp) > 1 && devvp != rootvp)
 		return (EBUSY);
 	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
-	error = vinvalbuf(devvp, V_SAVE, cred, p, 0, 0);
+	error = vinvalbuf(devvp, V_SAVE, cred, p, 0, INFSLP);
 	VOP_UNLOCK(devvp);
 	if (error)
 		return (error);
@@ -1060,7 +1060,7 @@ ffs_unmount(struct mount *mp, int mntflags, struct proc *p)
 	ump->um_devvp->v_specmountpoint = NULL;
 
 	vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY);
-	vinvalbuf(ump->um_devvp, V_SAVE, NOCRED, p, 0, 0);
+	vinvalbuf(ump->um_devvp, V_SAVE, NOCRED, p, 0, INFSLP);
 	(void)VOP_CLOSE(ump->um_devvp, fs->fs_ronly ? FREAD : FREAD|FWRITE,
 	    NOCRED, p);
 	vput(ump->um_devvp);
diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index f1e995f5c09..20bb440da99 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mfs_vnops.c,v 1.51 2018/04/28 03:13:05 visa Exp $	*/
+/*	$OpenBSD: mfs_vnops.c,v 1.52 2019/07/25 01:43:21 cheloha Exp $	*/
 /*	$NetBSD: mfs_vnops.c,v 1.8 1996/03/17 02:16:32 christos Exp $	*/
 
 /*
@@ -193,7 +193,8 @@ mfs_close(void *v)
 	 * On last close of a memory filesystem we must invalidate any in
 	 * core blocks, so that we can free up its vnode.
 	 */
-	if ((error = vinvalbuf(vp, V_SAVE, ap->a_cred, ap->a_p, 0, 0)) != 0)
+	error = vinvalbuf(vp, V_SAVE, ap->a_cred, ap->a_p, 0, INFSLP);
+	if (error != 0)
 		return (error);
 
 #ifdef DIAGNOSTIC