UBC was a disaster. It worked very good when it worked, but on some

machines or some configurations or in some phase of the moon (we actually
don't know when or why) files disappeared. Since we've not been able to
track down the problem in two weeks intense debugging and we need -current
to be stable, back out everything to a state it had before UBC.

We apologise for the inconvenience.

1 files changed, 1 insertions, 107 deletions

diff --git a/sys/kern/vnode_if.c b/sys/kern/vnode_if.c
index dbb2b7a438d..1f30d85c507 100644
--- a/sys/kern/vnode_if.c
+++ b/sys/kern/vnode_if.c
@@ -3,7 +3,7 @@
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *	OpenBSD: vnode_if.src,v 1.17 2001/12/10 04:45:31 art Exp 
+ *	OpenBSD: vnode_if.src,v 1.11 2001/06/23 02:21:05 csapuntz Exp 
  * by the script:
  *	OpenBSD: vnode_if.sh,v 1.8 2001/02/26 17:34:18 art Exp 
  */
@@ -1230,109 +1230,6 @@ int VOP_WHITEOUT(dvp, cnp, flags)
 	return (VCALL(dvp, VOFFSET(vop_whiteout), &a));
 }
 
-int vop_getpages_vp_offsets[] = {
-	VOPARG_OFFSETOF(struct vop_getpages_args,a_vp),
-	VDESC_NO_OFFSET
-};
-struct vnodeop_desc vop_getpages_desc = {
-	0,
-	"vop_getpages",
-	0,
-	vop_getpages_vp_offsets,
-	VDESC_NO_OFFSET,
-	VDESC_NO_OFFSET,
-	VDESC_NO_OFFSET,
-	VDESC_NO_OFFSET,
-	NULL,
-};
-
-int VOP_GETPAGES(vp, offset, m, count, centeridx, access_type, advice, flags)
-	struct vnode *vp;
-	voff_t offset;
-	struct vm_page **m;
-	int *count;
-	int centeridx;
-	vm_prot_t access_type;
-	int advice;
-	int flags;
-{
-	struct vop_getpages_args a;
-	a.a_desc = VDESC(vop_getpages);
-	a.a_vp = vp;
-	a.a_offset = offset;
-	a.a_m = m;
-	a.a_count = count;
-	a.a_centeridx = centeridx;
-	a.a_access_type = access_type;
-	a.a_advice = advice;
-	a.a_flags = flags;
-	return (VCALL(vp, VOFFSET(vop_getpages), &a));
-}
-
-int vop_putpages_vp_offsets[] = {
-	VOPARG_OFFSETOF(struct vop_putpages_args,a_vp),
-	VDESC_NO_OFFSET
-};
-struct vnodeop_desc vop_putpages_desc = {
-	0,
-	"vop_putpages",
-	0,
-	vop_putpages_vp_offsets,
-	VDESC_NO_OFFSET,
-	VDESC_NO_OFFSET,
-	VDESC_NO_OFFSET,
-	VDESC_NO_OFFSET,
-	NULL,
-};
-
-int VOP_PUTPAGES(vp, m, count, flags, rtvals)
-	struct vnode *vp;
-	struct vm_page **m;
-	int count;
-	int flags;
-	int *rtvals;
-{
-	struct vop_putpages_args a;
-	a.a_desc = VDESC(vop_putpages);
-	a.a_vp = vp;
-	a.a_m = m;
-	a.a_count = count;
-	a.a_flags = flags;
-	a.a_rtvals = rtvals;
-	return (VCALL(vp, VOFFSET(vop_putpages), &a));
-}
-
-int vop_mmap_vp_offsets[] = {
-	VOPARG_OFFSETOF(struct vop_mmap_args,a_vp),
-	VDESC_NO_OFFSET
-};
-struct vnodeop_desc vop_mmap_desc = {
-	0,
-	"vop_mmap",
-	0,
-	vop_mmap_vp_offsets,
-	VDESC_NO_OFFSET,
-	VOPARG_OFFSETOF(struct vop_mmap_args, a_cred),
-	VOPARG_OFFSETOF(struct vop_mmap_args, a_p),
-	VDESC_NO_OFFSET,
-	NULL,
-};
-
-int VOP_MMAP(vp, fflags, cred, p)
-	struct vnode *vp;
-	int fflags;
-	struct ucred *cred;
-	struct proc *p;
-{
-	struct vop_mmap_args a;
-	a.a_desc = VDESC(vop_mmap);
-	a.a_vp = vp;
-	a.a_fflags = fflags;
-	a.a_cred = cred;
-	a.a_p = p;
-	return (VCALL(vp, VOFFSET(vop_mmap), &a));
-}
-
 /* Special cases: */
 
 int vop_strategy_vp_offsets[] = {
@@ -1426,9 +1323,6 @@ struct vnodeop_desc *vfs_op_descs[] = {
 	&vop_advlock_desc,
 	&vop_reallocblks_desc,
 	&vop_whiteout_desc,
-	&vop_getpages_desc,
-	&vop_putpages_desc,
-	&vop_mmap_desc,
 	NULL
 };