summaryrefslogtreecommitdiffstats
path: root/sys/msdosfs
diff options
context:
space:
mode:
authorcheloha <cheloha@openbsd.org>2019-07-25 01:43:20 +0000
committercheloha <cheloha@openbsd.org>2019-07-25 01:43:20 +0000
commita8d7c3beb68e1470bb5980be2ef07ac9b9f618fc (patch)
tree8b15b09e6f1561e1b23d19395deac849ada631ad /sys/msdosfs
parentmake a half-hearted attempt to shrink trunkport info a bit (diff)
downloadwireguard-openbsd-a8d7c3beb68e1470bb5980be2ef07ac9b9f618fc.tar.xz
wireguard-openbsd-a8d7c3beb68e1470bb5980be2ef07ac9b9f618fc.zip
vinvalbuf(9): tlseep -> tsleep_nsec(9); ok millert@
Diffstat (limited to 'sys/msdosfs')
-rw-r--r--sys/msdosfs/msdosfs_denode.c4
-rw-r--r--sys/msdosfs/msdosfs_vfsops.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index 6c2b3a67c08..6bd4ecf4fc6 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msdosfs_denode.c,v 1.63 2018/05/27 06:02:14 visa Exp $ */
+/* $OpenBSD: msdosfs_denode.c,v 1.64 2019/07/25 01:43:21 cheloha Exp $ */
/* $NetBSD: msdosfs_denode.c,v 1.23 1997/10/17 11:23:58 ws Exp $ */
/*-
@@ -476,7 +476,7 @@ detrunc(struct denode *dep, uint32_t length, int flags, struct ucred *cred,
if (!isadir)
dep->de_flag |= DE_UPDATE|DE_MODIFIED;
vflags = (length > 0 ? V_SAVE : 0) | V_SAVEMETA;
- vinvalbuf(DETOV(dep), vflags, cred, p, 0, 0);
+ vinvalbuf(DETOV(dep), vflags, cred, p, 0, INFSLP);
allerror = deupdat(dep, 1);
#ifdef MSDOSFS_DEBUG
printf("detrunc(): allerror %d, eofentry %d\n",
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index 6a4e559d776..58d0c95ec65 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msdosfs_vfsops.c,v 1.90 2018/05/27 06:02:15 visa Exp $ */
+/* $OpenBSD: msdosfs_vfsops.c,v 1.91 2019/07/25 01:43:21 cheloha Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.48 1997/10/18 02:54:57 briggs Exp $ */
/*-
@@ -282,7 +282,7 @@ msdosfs_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, p->p_ucred, p, 0, 0);
+ error = vinvalbuf(devvp, V_SAVE, p->p_ucred, p, 0, INFSLP);
VOP_UNLOCK(devvp);
if (error)
return (error);