aboutsummaryrefslogtreecommitdiff
path: root/sys/kern/vfs_vnops.c
diff options
context:
space:
mode:
authorJohn Dyson <dyson@FreeBSD.org>1997-12-29 01:03:55 +0000
committerJohn Dyson <dyson@FreeBSD.org>1997-12-29 01:03:55 +0000
commit60f8d46448d17922a5d8bf5a65bbff21cf0576af (patch)
tree2b270d40e8d319d2bc4e0b622cb291f669be5025 /sys/kern/vfs_vnops.c
parent2be70f79f6dcc03377819b327700531ce5455896 (diff)
downloadsrc-60f8d46448d17922a5d8bf5a65bbff21cf0576af.tar.gz
src-60f8d46448d17922a5d8bf5a65bbff21cf0576af.zip
Fix the decl of vfs_ioopt, allow LFS to compile again, fix a minor problem
with the object cache removal.
Notes
Notes: svn path=/head/; revision=32072
Diffstat (limited to 'sys/kern/vfs_vnops.c')
-rw-r--r--sys/kern/vfs_vnops.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 460bdd7b67c4..e0c9b4a88aa3 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,11 +36,12 @@
* SUCH DAMAGE.
*
* @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94
- * $Id: vfs_vnops.c,v 1.43 1997/12/06 04:11:11 sef Exp $
+ * $Id: vfs_vnops.c,v 1.44 1997/12/29 00:22:55 dyson Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/kernel.h>
#include <sys/fcntl.h>
#include <sys/file.h>
#include <sys/stat.h>
@@ -510,8 +511,8 @@ vn_lock(vp, flags, p)
if (vp->v_flag & VXLOCK) {
vp->v_flag |= VXWANT;
simple_unlock(&vp->v_interlock);
- if (tsleep((caddr_t)vp, PINOD, "vn_lock", 100*5)) {
- vprint("vn_lock:", vp);
+ if (tsleep((caddr_t)vp, PINOD, "vn_lock", 60*hz)) {
+ vprint("vn_lock: timeout:", vp);
}
error = ENOENT;
} else {