aboutsummaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/vfs_export.c5
-rw-r--r--sys/kern/vfs_subr.c5
-rw-r--r--sys/kern/vfs_vnops.c7
3 files changed, 12 insertions, 5 deletions
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index f39c17d712dd..69f110188130 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.116 1997/12/19 09:03:28 dyson Exp $
+ * $Id: vfs_subr.c,v 1.117 1997/12/29 00:22:45 dyson Exp $
*/
/*
@@ -108,6 +108,9 @@ SYSCTL_INT(_debug, OID_AUTO, wantfreevnodes, CTLFLAG_RW, &wantfreevnodes, 0, "")
static u_long freevnodes = 0;
SYSCTL_INT(_debug, OID_AUTO, freevnodes, CTLFLAG_RD, &freevnodes, 0, "");
+int vfs_ioopt = 0;
+SYSCTL_INT(_vfs, OID_AUTO, ioopt, CTLFLAG_RW, &vfs_ioopt, 0, "");
+
struct mntlist mountlist; /* mounted filesystem list */
struct simplelock mountlist_slock;
static struct simplelock mntid_slock;
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index f39c17d712dd..69f110188130 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.116 1997/12/19 09:03:28 dyson Exp $
+ * $Id: vfs_subr.c,v 1.117 1997/12/29 00:22:45 dyson Exp $
*/
/*
@@ -108,6 +108,9 @@ SYSCTL_INT(_debug, OID_AUTO, wantfreevnodes, CTLFLAG_RW, &wantfreevnodes, 0, "")
static u_long freevnodes = 0;
SYSCTL_INT(_debug, OID_AUTO, freevnodes, CTLFLAG_RD, &freevnodes, 0, "");
+int vfs_ioopt = 0;
+SYSCTL_INT(_vfs, OID_AUTO, ioopt, CTLFLAG_RW, &vfs_ioopt, 0, "");
+
struct mntlist mountlist; /* mounted filesystem list */
struct simplelock mountlist_slock;
static struct simplelock mntid_slock;
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 {