summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-03-11 18:55:25 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-03-11 18:55:25 +0000
commit7fc726a3799f6bbabcce5d5fd71c501c1e47ecaf (patch)
treeb259ffef46191ed907c1ec06a7d091df9cb42aa1 /sys
parentc8ba4c17aa5e393cb2833764f74d09bdedcd3458 (diff)
back out unapproved changes
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/vfs_subr.c12
-rw-r--r--sys/sys/mount.h5
2 files changed, 8 insertions, 9 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index a2948c8ce39..59fd706af2a 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_subr.c,v 1.34 1999/03/11 18:30:49 mickey Exp $ */
+/* $OpenBSD: vfs_subr.c,v 1.35 1999/03/11 18:55:24 deraadt Exp $ */
/* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */
/*
@@ -1774,11 +1774,11 @@ vfs_syncwait(verbose)
for (bp = &buf[nbuf]; --bp >= buf; )
if ((bp->b_flags & (B_BUSY|B_INVAL)) == B_BUSY)
nbusy++;
- if (nbusy == 0)
- break;
- if (verbose)
- printf("%d ", nbusy);
- DELAY(40000 * iter);
+ if (nbusy == 0)
+ break;
+ if (verbose)
+ printf("%d ", nbusy);
+ DELAY(40000 * iter);
}
return nbusy;
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 319053cfabe..9bf243df745 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount.h,v 1.26 1999/03/11 18:29:03 mickey Exp $ */
+/* $OpenBSD: mount.h,v 1.27 1999/03/11 18:55:24 deraadt Exp $ */
/* $NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $ */
/*
@@ -506,8 +506,7 @@ struct netcred *vfs_export_lookup /* lookup host in fs export list */
__P((struct mount *, struct netexport *, struct mbuf *));
int vfs_allocate_syncvnode __P((struct mount *));
-int vfs_syncwait __P((int)); /* sync and wait for complete */
-void vfs_shutdown __P((void)); /* unmount and sync file systems */
+void vfs_shutdown __P((void)); /* unmount and sync file systems */
long makefstype __P((char *));
int dounmount __P((struct mount *, int, struct proc *));
void vfsinit __P((void));