diff options
| -rw-r--r-- | sys/kern/vfs_export.c | 5 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 5 | ||||
| -rw-r--r-- | sys/kern/vfs_vnops.c | 7 | ||||
| -rw-r--r-- | sys/sys/vnode.h | 3 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_readwrite.c | 11 | ||||
| -rw-r--r-- | sys/vm/vm_map.c | 3 |
6 files changed, 19 insertions, 15 deletions
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index f39c17d..69f1101 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 f39c17d..69f1101 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 460bdd7..e0c9b4a 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 { diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index e6a356a..857ba23 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $Id: vnode.h,v 1.59 1997/12/15 03:09:51 wollman Exp $ + * $Id: vnode.h,v 1.60 1997/12/29 00:24:16 dyson Exp $ */ #ifndef _SYS_VNODE_H_ @@ -269,6 +269,7 @@ extern int desiredvnodes; /* number of vnodes desired */ extern struct vm_zone *namei_zone; extern int prtactive; /* nonzero to call vprint() */ extern struct vattr va_null; /* predefined null vattr structure */ +extern int vfs_ioopt; /* * Macro/function to check for client cache inconsistency w.r.t. leasing. diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c index d63d14b..1484082 100644 --- a/sys/ufs/ufs/ufs_readwrite.c +++ b/sys/ufs/ufs/ufs_readwrite.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_readwrite.c 8.11 (Berkeley) 5/8/95 - * $Id: ufs_readwrite.c,v 1.36 1997/12/19 09:03:06 dyson Exp $ + * $Id: ufs_readwrite.c,v 1.37 1997/12/21 10:41:19 dyson Exp $ */ #ifdef LFS_READWRITE @@ -52,19 +52,16 @@ #define READ_S "ffs_read" #define WRITE ffs_write #define WRITE_S "ffs_write" +#endif + #include <vm/vm.h> +#include <vm/vm_object.h> #include <vm/vm_pager.h> #include <vm/vm_map.h> #include <vm/vnode_pager.h> -#endif #include <sys/poll.h> #include <sys/sysctl.h> -int vfs_ioopt = 0; - -SYSCTL_INT(_vfs, OID_AUTO, ioopt, - CTLFLAG_RW, &vfs_ioopt, 0, ""); - /* * Vnode op for reading. */ diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index b20b433..11604ce 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.c,v 1.101 1997/12/25 20:55:15 dyson Exp $ + * $Id: vm_map.c,v 1.102 1997/12/29 00:24:43 dyson Exp $ */ /* @@ -93,7 +93,6 @@ #include <vm/vm_zone.h> static MALLOC_DEFINE(M_VMMAP, "VM map", "VM map structures"); -extern int vfs_ioopt; /* * Virtual memory maps provide for the mapping, protection, |
