From d09985e2af7587bab02ec6e21a6f9deb352375f4 Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Date: Wed, 10 May 1989 03:54:35 -0800
Subject: [PATCH] merge in vnodes

SCCS-vsn: sys/tahoe/tahoe/vm_machdep.c 7.3
SCCS-vsn: sys/tahoe/vba/mp.c 7.10
---
 usr/src/sys/tahoe/tahoe/vm_machdep.c | 8 ++++----
 usr/src/sys/tahoe/vba/mp.c           | 6 ++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/usr/src/sys/tahoe/tahoe/vm_machdep.c b/usr/src/sys/tahoe/tahoe/vm_machdep.c
index 628ac357ea..1ed436fd46 100644
--- a/usr/src/sys/tahoe/tahoe/vm_machdep.c
+++ b/usr/src/sys/tahoe/tahoe/vm_machdep.c
@@ -15,18 +15,18 @@
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)vm_machdep.c	7.2 (Berkeley) %G%
+ *	@(#)vm_machdep.c	7.3 (Berkeley) %G%
  */
 
 #include "param.h"
 #include "systm.h"
-#include "dir.h"
 #include "user.h"
 #include "proc.h"
 #include "cmap.h"
 #include "mount.h"
+#include "../ufs/ufsmount.h"
 #include "vm.h"
 #include "text.h"
 #include "kernel.h"
@@ -117,7 +117,7 @@ chgprot(addr, tprot)
 	if (pte->pg_fod == 0 && pte->pg_pfnum) {
 		c = &cmap[pgtocm(pte->pg_pfnum)];
 		if (c->c_blkno && c->c_mdev != MSWAPX)
-			munhash(mount[c->c_mdev].m_dev,
+			munhash(mounttab[c->c_mdev].um_devvp,
 			    (daddr_t)(u_long)c->c_blkno);
 	}
 	*(int *)pte &= ~PG_PROT;
diff --git a/usr/src/sys/tahoe/vba/mp.c b/usr/src/sys/tahoe/vba/mp.c
index dcf4d78eb2..ccf52b0bc9 100644
--- a/usr/src/sys/tahoe/vba/mp.c
+++ b/usr/src/sys/tahoe/vba/mp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)mp.c	7.9 (Berkeley) %G%
+ *	@(#)mp.c	7.10 (Berkeley) %G%
  */
 
 #include "mp.h"
@@ -29,13 +29,11 @@
 #include "param.h"
 #include "ioctl.h"
 #include "tty.h"
-#include "dir.h"
 #include "user.h"
 #include "map.h"
 #include "buf.h"
 #include "conf.h"
 #include "file.h"
-#include "uio.h"
 #include "errno.h"
 #include "syslog.h"
 #include "vmmac.h"
@@ -1311,7 +1309,7 @@ mpdlwrite(dev, uio)
 	dl = &ms->ms_mb->mb_dl;
 	dl->mpdl_count = uio->uio_iov->iov_len;
 	dl->mpdl_data = (caddr_t) kvtophys(mpdlbuf);
-	if (error = uiomove(mpdlbuf, (int)dl->mpdl_count, UIO_WRITE, uio))
+	if (error = uiomove(mpdlbuf, (int)dl->mpdl_count, uio))
 		return (error);
 	uio->uio_resid -= dl->mpdl_count;    /* set up return from write */
 	dl->mpdl_cmd = MPDLCMD_NORMAL;
-- 
2.20.1