d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the decl of vfs_ioopt, allow LFS to compile again, fix a minor problem

Browse Source 
with the object cache removal.
This commit is contained in:
dyson 1997-12-29 01:03:55 +00:00
parent 3d6663f697
commit 9e48074b6c
6 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/kern/vfs_export.c
View File

@ -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;

5
sys/kern/vfs_subr.c
View File

@ -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;

7
sys/kern/vfs_vnops.c
View File

@ -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 {

3
sys/sys/vnode.h
View File

@ -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.

11
sys/ufs/ufs/ufs_readwrite.c
View File

@ -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.
*/

3
sys/vm/vm_map.c
View File

@ -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,