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.

3 files changed, 4 insertions, 32 deletions

diff --git a/sys/adosfs/adosfs.h b/sys/adosfs/adosfs.h
index c608fba701b..5c0b9e3c893 100644
--- a/sys/adosfs/adosfs.h
+++ b/sys/adosfs/adosfs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adosfs.h,v 1.9 2001/12/10 04:45:31 art Exp $	*/
+/*	$OpenBSD: adosfs.h,v 1.10 2001/12/19 08:58:05 art Exp $	*/
 /*	$NetBSD: adosfs.h,v 1.12 1996/10/08 22:18:02 thorpej Exp $	*/
 
 /*
@@ -32,8 +32,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <miscfs/genfs/genfs.h>
-
 /*
  * Amigados datestamp. (from 1/1/1978 00:00:00 local)
  */
@@ -53,7 +51,6 @@ enum anode_type { AROOT, ADIR, AFILE, ALDIR, ALFILE, ASLINK };
  * table for f/e. it is always ANODETABSZ(ap) bytes in size.
  */
 struct anode {
-	struct genfs_node gnode;
 	LIST_ENTRY(anode) link;
 	enum anode_type type;
 	char name[31];			/* (r/d/f) name for object */
diff --git a/sys/adosfs/advfsops.c b/sys/adosfs/advfsops.c
index 5cd599c4f8e..43a673042b5 100644
--- a/sys/adosfs/advfsops.c
+++ b/sys/adosfs/advfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advfsops.c,v 1.20 2001/12/10 04:45:31 art Exp $	*/
+/*	$OpenBSD: advfsops.c,v 1.21 2001/12/19 08:58:05 art Exp $	*/
 /*	$NetBSD: advfsops.c,v 1.24 1996/12/22 10:10:12 cgd Exp $	*/
 
 /*
@@ -557,7 +557,6 @@ adosfs_vget(mp, an, vpp)
 
 	*vpp = vp;		/* return vp */
 	brelse(bp);		/* release buffer */
-	vp->v_size = ap->fsize;
 	return (0);
 }
 
diff --git a/sys/adosfs/advnops.c b/sys/adosfs/advnops.c
index 4928e2b1b93..27f806f3bce 100644
--- a/sys/adosfs/advnops.c
+++ b/sys/adosfs/advnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advnops.c,v 1.21 2001/12/10 04:45:31 art Exp $	*/
+/*	$OpenBSD: advnops.c,v 1.22 2001/12/19 08:58:05 art Exp $	*/
 /*	$NetBSD: advnops.c,v 1.32 1996/10/13 02:52:09 christos Exp $	*/
 
 /*
@@ -131,9 +131,7 @@ struct vnodeopv_entry_desc adosfs_vnodeop_entries[] = {
 	{ &vop_pathconf_desc, adosfs_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, adosfs_advlock },		/* advlock */
 	{ &vop_bwrite_desc, adosfs_bwrite },		/* bwrite */
-	{ &vop_getpages_desc, genfs_getpages },
-	{ &vop_mmap_desc, vop_generic_mmap },
-	{ NULL, NULL }
+	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
 
 struct vnodeopv_desc adosfs_vnodeop_opv_desc =
@@ -274,28 +272,6 @@ adosfs_read(v)
 	/*
 	 * taken from ufs_read()
 	 */
-
-	if (sp->a_vp->v_type == VREG) {
-		error = 0;
-		while (uio->uio_resid > 0) {
-			void *win;
-			vsize_t bytelen = min(ap->fsize - uio->uio_offset,
-					uio->uio_resid);
-
-			if (bytelen == 0) {
-				break;
-			}
-			win = ubc_alloc(&sp->a_vp->v_uobj, uio->uio_offset,
-					&bytelen, UBC_READ);
-			error = uiomove(win, bytelen, uio);
-			ubc_release(win, 0);
-			if (error) {
-				break;
-			}
-		}
-		goto reterr;
-	}
-
 	do {
 		/*
 		 * we are only supporting ADosFFS currently