From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Fri, 15 Aug 2003 07:26:16 +0000 (+0000)
Subject: Make modules work again part 1: linkup vfs, rename Makefile.module files,
X-Git-Tag: v2.0.1~13093
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/7d1b9a3b84deae563f1a0cb71a97fc4d4174ea51

Make modules work again part 1: linkup vfs, rename Makefile.module files,
add additional Makefile's as appropriate, and fixup junk header file
generation.
---

diff --git a/sys/vfs/Makefile b/sys/vfs/Makefile
new file mode 100644
index 0000000000..3d0fd1f668
--- /dev/null
+++ b/sys/vfs/Makefile
@@ -0,0 +1,8 @@
+# Makefile for vfs modules
+#
+# $DragonFly: src/sys/vfs/Makefile,v 1.1 2003/08/15 07:26:13 dillon Exp $
+
+SUBDIR=fifofs msdosfs portal umapfs gnu nfs procfs union \
+	coda hpfs ntfs smbfs isofs nullfs fdesc mfs nwfs
+
+.include <bsd.subdir.mk>
diff --git a/sys/vfs/coda/Makefile b/sys/vfs/coda/Makefile
index 7439b9d026..4a00738768 100644
--- a/sys/vfs/coda/Makefile
+++ b/sys/vfs/coda/Makefile
@@ -1,16 +1,15 @@
 # $FreeBSD: src/sys/modules/coda/Makefile,v 1.7.2.1 2001/07/24 09:49:42 dd Exp $
-# $DragonFly: src/sys/vfs/coda/Attic/Makefile,v 1.2 2003/06/17 04:28:43 dillon Exp $
+# $DragonFly: src/sys/vfs/coda/Attic/Makefile,v 1.3 2003/08/15 07:26:14 dillon Exp $
 
-.PATH:	${.CURDIR}/../../coda
 KMOD=	coda
 SRCS=	vnode_if.h \
 	coda_fbsd.c coda_namecache.c coda_psdev.c coda_subr.c \
-	coda_venus.c coda_vfsops.c coda_vnops.c vcoda.h
+	coda_venus.c coda_vfsops.c coda_vnops.c use_vcoda.h
 NOMAN=
 
-CLEANFILES=	vcoda.h
+CLEANFILES=	use_vcoda.h
 
-vcoda.h:
-	echo "#define NVCODA 4" > vcoda.h
+use_vcoda.h:
+	echo "#define NVCODA 4" > use_vcoda.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/vfs/fdesc/Makefile b/sys/vfs/fdesc/Makefile
index 34500751cc..b349f622cd 100644
--- a/sys/vfs/fdesc/Makefile
+++ b/sys/vfs/fdesc/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD: src/sys/modules/fdesc/Makefile,v 1.6 1999/12/12 16:47:24 peter Exp $
-# $DragonFly: src/sys/vfs/fdesc/Makefile,v 1.2 2003/06/17 04:28:44 dillon Exp $
+# $DragonFly: src/sys/vfs/fdesc/Makefile,v 1.3 2003/08/15 07:26:14 dillon Exp $
 
-.PATH:	${.CURDIR}/../../miscfs/fdesc
 KMOD=	fdesc
 SRCS=	vnode_if.h \
 	fdesc_vfsops.c fdesc_vnops.c
diff --git a/sys/vfs/fifofs/Makefile b/sys/vfs/fifofs/Makefile
new file mode 100644
index 0000000000..5c62b30d97
--- /dev/null
+++ b/sys/vfs/fifofs/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD: src/sys/modules/nullfs/Makefile,v 1.10 1999/12/12 16:47:29 peter Exp $
+# $DragonFly: src/sys/vfs/fifofs/Makefile,v 1.1 2003/08/15 07:26:14 dillon Exp $
+
+KMOD=	fifo
+SRCS=	vnode_if.h fifo_vnops.c
+NOMAN=
+
+.include <bsd.kmod.mk>
diff --git a/sys/vfs/gnu/Makefile b/sys/vfs/gnu/Makefile
new file mode 100644
index 0000000000..8e569a0594
--- /dev/null
+++ b/sys/vfs/gnu/Makefile
@@ -0,0 +1,6 @@
+# $DragonFly: src/sys/vfs/gnu/Makefile,v 1.1 2003/08/15 07:26:15 dillon Exp $
+#
+
+SUBDIR=ext2fs
+
+.include <bsd.subdir.mk>
diff --git a/sys/vfs/hpfs/Makefile b/sys/vfs/hpfs/Makefile
index 1d45535d69..7a0ac74296 100644
--- a/sys/vfs/hpfs/Makefile
+++ b/sys/vfs/hpfs/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD: src/sys/modules/hpfs/Makefile,v 1.3 1999/12/12 20:34:02 peter Exp $
-# $DragonFly: src/sys/vfs/hpfs/Makefile,v 1.2 2003/06/17 04:28:44 dillon Exp $
+# $DragonFly: src/sys/vfs/hpfs/Makefile,v 1.3 2003/08/15 07:26:15 dillon Exp $
 
-.PATH:	${.CURDIR}/../../fs/hpfs
 KMOD=	hpfs
 SRCS=	vnode_if.h \
 	hpfs_vfsops.c hpfs_vnops.c hpfs_hash.c hpfs_subr.c hpfs_lookup.c \
diff --git a/sys/vfs/hpfs/hpfs.h b/sys/vfs/hpfs/hpfs.h
index 91d2d9db80..2973aaf101 100644
--- a/sys/vfs/hpfs/hpfs.h
+++ b/sys/vfs/hpfs/hpfs.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/hpfs/hpfs.h,v 1.1 1999/12/09 19:09:58 semenu Exp $
- * $DragonFly: src/sys/vfs/hpfs/hpfs.h,v 1.4 2003/07/26 18:51:23 rob Exp $
+ * $DragonFly: src/sys/vfs/hpfs/hpfs.h,v 1.5 2003/08/15 07:26:15 dillon Exp $
  */
 
 /*#define HPFS_DEBUG 10*/
@@ -415,7 +415,7 @@ extern vop_t ** hpfs_vnodeop_p;
 void hpfs_hphashinit __P((void));
 struct hpfsnode *hpfs_hphashlookup __P((dev_t, lsn_t));
 struct hpfsnode *hpfs_hphashget __P((dev_t, lsn_t));
-struct vnode *hpfs_hphashvget __P((dev_t, lsn_t, struct proc *));
+struct vnode *hpfs_hphashvget __P((dev_t, lsn_t, struct thread *));
 void hpfs_hphashins __P((struct hpfsnode *));
 void hpfs_hphashrem __P((struct hpfsnode *));
 extern struct lock hpfs_hphash_lock;
diff --git a/sys/vfs/hpfs/hpfs_hash.c b/sys/vfs/hpfs/hpfs_hash.c
index 66bfb09eb4..7c67c2d131 100644
--- a/sys/vfs/hpfs/hpfs_hash.c
+++ b/sys/vfs/hpfs/hpfs_hash.c
@@ -32,7 +32,7 @@
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
  * $FreeBSD: src/sys/fs/hpfs/hpfs_hash.c,v 1.1 1999/12/09 19:09:58 semenu Exp $
- * $DragonFly: src/sys/vfs/hpfs/hpfs_hash.c,v 1.6 2003/08/07 21:17:41 dillon Exp $
+ * $DragonFly: src/sys/vfs/hpfs/hpfs_hash.c,v 1.7 2003/08/15 07:26:15 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -114,10 +114,10 @@ loop:
 #endif
 
 struct vnode *
-hpfs_hphashvget(dev, ino, p)
+hpfs_hphashvget(dev, ino, td)
 	dev_t dev;
 	lsn_t ino;
-	struct proc *p;
+	struct thread *td;
 {
 	struct hpfsnode *hp;
 	struct vnode *vp;
@@ -131,7 +131,7 @@ loop:
 			lwkt_gettoken (&vp->v_interlock);
 			if (lwkt_gentoken(&hpfs_hphash_token, &gen))
 				goto loop;
-			if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, p)) {
+			if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td)) {
 				gen = lwkt_regettoken(&hpfs_hphash_token);
 				goto loop;
 			}
diff --git a/sys/vfs/hpfs/hpfs_subr.c b/sys/vfs/hpfs/hpfs_subr.c
index e1418aa5b2..1fa0bf86fd 100644
--- a/sys/vfs/hpfs/hpfs_subr.c
+++ b/sys/vfs/hpfs/hpfs_subr.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/hpfs/hpfs_subr.c,v 1.1 1999/12/09 19:09:59 semenu Exp $
- * $DragonFly: src/sys/vfs/hpfs/hpfs_subr.c,v 1.5 2003/08/07 21:17:41 dillon Exp $
+ * $DragonFly: src/sys/vfs/hpfs/hpfs_subr.c,v 1.6 2003/08/15 07:26:15 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -552,7 +552,7 @@ dive:
 	dprintf(("[dive 0x%x] ", lsn));
 	if (bp != NULL)
 		brelse(bp);
-	error = bread(dhp->h_devvp, lsn, D_BSIZE, NOCRED, &bp);
+	error = bread(dhp->h_devvp, lsn, D_BSIZE, &bp);
 	if (error)
 		goto failed;
 
@@ -842,7 +842,7 @@ hpfs_breadstruct (
 
 	*bpp = NULL;
 
-	error = bread(hpmp->hpm_devvp, lsn, len, NOCRED, &bp);
+	error = bread(hpmp->hpm_devvp, lsn, len, &bp);
 	if (error) {
 		brelse(bp);
 		return (error);
diff --git a/sys/vfs/hpfs/hpfs_vfsops.c b/sys/vfs/hpfs/hpfs_vfsops.c
index dc1660e7db..57211eb30f 100644
--- a/sys/vfs/hpfs/hpfs_vfsops.c
+++ b/sys/vfs/hpfs/hpfs_vfsops.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.3.2.2 2001/12/25 01:44:45 dillon Exp $
- * $DragonFly: src/sys/vfs/hpfs/hpfs_vfsops.c,v 1.7 2003/08/07 21:17:41 dillon Exp $
+ * $DragonFly: src/sys/vfs/hpfs/hpfs_vfsops.c,v 1.8 2003/08/15 07:26:15 dillon Exp $
  */
 
 
@@ -48,6 +48,7 @@
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
+#include <sys/buf2.h>
 
 #if defined(__NetBSD__)
 #include <miscfs/specfs/specdev.h>
@@ -64,12 +65,12 @@ MALLOC_DEFINE(M_HPFSNO, "HPFS node", "HPFS node structure");
 
 static int	hpfs_root __P((struct mount *, struct vnode **));
 static int	hpfs_statfs __P((struct mount *, struct statfs *,
-				 struct proc *));
-static int	hpfs_unmount __P((struct mount *, int, struct proc *));
+				 struct thread *));
+static int	hpfs_unmount __P((struct mount *, int, struct thread *));
 static int	hpfs_vget __P((struct mount *mp, ino_t ino,
 			       struct vnode **vpp));
 static int	hpfs_mountfs __P((struct vnode *, struct mount *, 
-				  struct hpfs_args *, struct proc *));
+				  struct hpfs_args *, struct thread *));
 static int	hpfs_vptofh __P((struct vnode *, struct fid *));
 static int	hpfs_fhtovp __P((struct mount *, struct fid *,
 				 struct vnode **));
@@ -85,7 +86,7 @@ static int	hpfs_sync __P((struct mount *, int, struct ucred *,
 #if defined(__FreeBSD__)
 struct sockaddr;
 static int	hpfs_mount __P((struct mount *, char *, caddr_t,
-				struct nameidata *, struct proc *));
+				struct nameidata *, struct thread *));
 static int	hpfs_init __P((struct vfsconf *));
 static int	hpfs_checkexp __P((struct mount *, struct sockaddr *,
 				   int *, struct ucred **));
@@ -133,14 +134,14 @@ hpfs_checkexp(mp, nam, exflagsp, credanonp)
 #if !defined(__FreeBSD__)
 /*ARGSUSED*/
 static int
-hpfs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
+hpfs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, td)
 	int *name;
 	u_int namelen;
 	void *oldp;
 	size_t *oldlenp;
 	void *newp;
 	size_t newlen;
-	struct proc *p;
+	struct thread *td;
 {
 	return (EINVAL);
 }
@@ -180,7 +181,7 @@ hpfs_mount (
 	void *data,
 #endif
 	struct nameidata *ndp,
-	struct proc *p )
+	struct thread *td )
 {
 	u_int		size;
 	int		err = 0;
@@ -229,7 +230,7 @@ hpfs_mount (
 	 * Not an update, or updating the name: look up the name
 	 * and verify that it refers to a sensible block device.
 	 */
-	NDINIT(ndp, LOOKUP, FOLLOW, UIO_USERSPACE, args.fspec, p);
+	NDINIT(ndp, LOOKUP, FOLLOW, UIO_USERSPACE, args.fspec, td);
 	err = namei(ndp);
 	if (err) {
 		/* can't get devvp!*/
@@ -278,7 +279,7 @@ hpfs_mount (
 			&size);				/* real size*/
 	bzero( mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
 
-	err = hpfs_mountfs(devvp, mp, &args, p);
+	err = hpfs_mountfs(devvp, mp, &args, td);
 	if (err)
 		goto error_2;
 
@@ -288,7 +289,7 @@ hpfs_mount (
 	 *
 	 * This code is common to root and non-root mounts
 	 */
-	(void)VFS_STATFS(mp, &mp->mnt_stat, p);
+	(void)VFS_STATFS(mp, &mp->mnt_stat, td);
 
 	goto success;
 
@@ -308,11 +309,11 @@ success:
  * Common code for mount and mountroot
  */
 int
-hpfs_mountfs(devvp, mp, argsp, p)
+hpfs_mountfs(devvp, mp, argsp, td)
 	struct vnode *devvp;
 	struct mount *mp;
 	struct hpfs_args *argsp;
-	struct proc *p;
+	struct thread *td;
 {
 	int error, ncount, ronly;
 	struct sublock *sup;
@@ -341,19 +342,19 @@ hpfs_mountfs(devvp, mp, argsp, p)
 		return (EBUSY);
 
 #if defined(__FreeBSD__)
-	VN_LOCK(devvp, LK_EXCLUSIVE | LK_RETRY, p);
-	error = vinvalbuf(devvp, V_SAVE, p, 0, 0);
-	VOP__UNLOCK(devvp, 0, p);
+	VN_LOCK(devvp, LK_EXCLUSIVE | LK_RETRY, td);
+	error = vinvalbuf(devvp, V_SAVE, td, 0, 0);
+	VOP__UNLOCK(devvp, 0, td);
 #else
-	error = vinvalbuf(devvp, V_SAVE, p, 0, 0);
+	error = vinvalbuf(devvp, V_SAVE, td, 0, 0);
 #endif
 	if (error)
 		return (error);
 
 	ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
-	VN_LOCK(devvp, LK_EXCLUSIVE | LK_RETRY, p);
-	error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, p);
-	VOP__UNLOCK(devvp, 0, p);
+	VN_LOCK(devvp, LK_EXCLUSIVE | LK_RETRY, td);
+	error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td);
+	VOP__UNLOCK(devvp, 0, td);
 	if (error)
 		return (error);
 
@@ -364,14 +365,14 @@ hpfs_mountfs(devvp, mp, argsp, p)
 	bzero(hpmp, sizeof(struct hpfsmount));
 
 	/* Read in SuperBlock */
-	error = bread(devvp, SUBLOCK, SUSIZE, NOCRED, &bp);
+	error = bread(devvp, SUBLOCK, SUSIZE, &bp);
 	if (error)
 		goto failed;
 	bcopy(bp->b_data, &hpmp->hpm_su, sizeof(struct sublock));
 	brelse(bp); bp = NULL;
 
 	/* Read in SpareBlock */
-	error = bread(devvp, SPBLOCK, SPSIZE, NOCRED, &bp);
+	error = bread(devvp, SPBLOCK, SPSIZE, &bp);
 	if (error)
 		goto failed;
 	bcopy(bp->b_data, &hpmp->hpm_sp, sizeof(struct spblock));
@@ -440,7 +441,7 @@ failed:
 #else
 	devvp->v_specflags &= ~SI_MOUNTEDON;
 #endif
-	(void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, p);
+	(void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, td);
 	return (error);
 }
 
@@ -449,7 +450,7 @@ static int
 hpfs_start (
 	struct mount *mp,
 	int flags,
-	struct proc *p )
+	struct thread *td )
 {
 	return (0);
 }
@@ -459,7 +460,7 @@ static int
 hpfs_unmount( 
 	struct mount *mp,
 	int mntflags,
-	struct proc *p)
+	struct thread *td)
 {
 	int error, flags, ronly;
 	struct hpfsmount *hpmp = VFSTOHPFS(mp);
@@ -486,9 +487,8 @@ hpfs_unmount(
 	hpmp->hpm_devvp->v_specflags &= ~SI_MOUNTEDON;
 #endif
 
-	vinvalbuf(hpmp->hpm_devvp, V_SAVE, p, 0, 0);
-	error = VOP_CLOSE(hpmp->hpm_devvp, ronly ? FREAD : FREAD|FWRITE,
-		NOCRED, p);
+	vinvalbuf(hpmp->hpm_devvp, V_SAVE, td, 0, 0);
+	error = VOP_CLOSE(hpmp->hpm_devvp, ronly ? FREAD : FREAD|FWRITE, td);
 
 	vrele(hpmp->hpm_devvp);
 
@@ -524,7 +524,7 @@ static int
 hpfs_statfs(
 	struct mount *mp,
 	struct statfs *sbp,
-	struct proc *p)
+	struct thread *td)
 {
 	struct hpfsmount *hpmp = VFSTOHPFS(mp);
 
@@ -559,7 +559,7 @@ hpfs_sync (
 	struct mount *mp,
 	int waitfor,
 	struct ucred *cred,
-	struct proc *p)
+	struct thread *td)
 {
 	return (0);
 }
@@ -570,7 +570,7 @@ hpfs_quotactl (
 	int cmds,
 	uid_t uid,
 	caddr_t arg,
-	struct proc *p)
+	struct thread *td)
 {
 	printf("hpfs_quotactl():\n");
 	return (EOPNOTSUPP);
@@ -625,7 +625,7 @@ hpfs_vget(
 	struct vnode *vp;
 	struct hpfsnode *hp;
 	struct buf *bp;
-	struct proc *p = curproc;	/* XXX */
+	struct thread *td = curthread;	/* XXX */
 	int error;
 
 	dprintf(("hpfs_vget(0x%x): ",ino));
@@ -634,7 +634,7 @@ hpfs_vget(
 	hp = NULL;
 	vp = NULL;
 
-	if ((*vpp = hpfs_hphashvget(hpmp->hpm_dev, ino, p)) != NULL) {
+	if ((*vpp = hpfs_hphashvget(hpmp->hpm_dev, ino, td)) != NULL) {
 		dprintf(("hashed\n"));
 		return (0);
 	}
@@ -682,14 +682,14 @@ hpfs_vget(
 	hp->h_devvp = hpmp->hpm_devvp;
 	VREF(hp->h_devvp);
 
-	error = VN_LOCK(vp, LK_EXCLUSIVE, p);
+	error = VN_LOCK(vp, LK_EXCLUSIVE, td);
 	if (error) {
 		vput(vp);
 		return (error);
 	}
 
 	do {
-		if ((*vpp = hpfs_hphashvget(hpmp->hpm_dev, ino, p)) != NULL) {
+		if ((*vpp = hpfs_hphashvget(hpmp->hpm_dev, ino, td)) != NULL) {
 			dprintf(("hashed2\n"));
 			vput(vp);
 			return (0);
@@ -700,7 +700,7 @@ hpfs_vget(
 
 	LOCKMGR(&hpfs_hphash_lock, LK_RELEASE, NULL, NULL);
 
-	error = bread(hpmp->hpm_devvp, ino, FNODESIZE, NOCRED, &bp);
+	error = bread(hpmp->hpm_devvp, ino, FNODESIZE, &bp);
 	if (error) {
 		printf("hpfs_vget: can't read ino %d\n",ino);
 		vput(vp);
diff --git a/sys/vfs/hpfs/hpfs_vnops.c b/sys/vfs/hpfs/hpfs_vnops.c
index 6729720965..bc7336c44d 100644
--- a/sys/vfs/hpfs/hpfs_vnops.c
+++ b/sys/vfs/hpfs/hpfs_vnops.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.2.2.2 2002/01/15 18:35:09 semenu Exp $
- * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.7 2003/08/07 21:17:41 dillon Exp $
+ * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.8 2003/08/15 07:26:15 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -54,6 +54,7 @@
 #include <vm/vnode_pager.h>
 #endif
 #include <vm/vm_extern.h>
+#include <sys/buf2.h>
 
 #if !defined(__FreeBSD__)
 #include <miscfs/specfs/specdev.h>
@@ -116,7 +117,7 @@ hpfs_fsync(ap)
 		struct vnode *a_vp;
 		struct ucred *a_cred;
 		int a_waitfor;
-		struct proc *a_p;
+		struct proc *a_td;
 	} */ *ap;
 {
 	struct vnode *vp = ap->a_vp;
@@ -167,7 +168,7 @@ hpfs_ioctl (
 		caddr_t a_data;
 		int a_fflag;
 		struct ucred *a_cred;
-		struct proc *a_p;
+		struct proc *a_td;
 	} */ *ap)
 {
 	struct vnode *vp = ap->a_vp;
@@ -367,7 +368,7 @@ hpfs_read(ap)
 		if (toread == 0) 
 			break;
 
-		error = bread(hp->h_devvp, bn, xfersz, NOCRED, &bp);
+		error = bread(hp->h_devvp, bn, xfersz, &bp);
 		if (error) {
 			brelse(bp);
 			break;
@@ -436,7 +437,7 @@ hpfs_write(ap)
 			bp = getblk(hp->h_devvp, bn, xfersz, 0, 0);
 			clrbuf(bp);
 		} else {
-			error = bread(hp->h_devvp, bn, xfersz, NOCRED, &bp);
+			error = bread(hp->h_devvp, bn, xfersz, &bp);
 			if (error) {
 				brelse(bp);
 				return (error);
@@ -468,7 +469,7 @@ hpfs_getattr(ap)
 		struct vnode *a_vp;
 		struct vattr *a_vap;
 		struct ucred *a_cred;
-		struct proc *a_p;
+		struct proc *a_td;
 	} */ *ap;
 {
 	struct vnode *vp = ap->a_vp;
@@ -568,7 +569,7 @@ hpfs_setattr(ap)
 		if (cred->cr_uid != hp->h_uid &&
 		    (error = suser_cred(cred, PRISON_ROOT)) &&
 		    ((vap->va_vaflags & VA_UTIMES_NULL) == 0 ||
-		    (error = VOP_ACCESS(vp, VWRITE, cred, p))))
+		    (error = VOP_ACCESS(vp, VWRITE, cred, td))))
 			return (error);
 		if (vap->va_atime.tv_sec != VNOVAL)
 			hp->h_atime = vap->va_atime.tv_sec;
@@ -593,7 +594,7 @@ hpfs_setattr(ap)
 
 		if (vap->va_size < hp->h_fn.fn_size) {
 #if defined(__FreeBSD__)
-			error = vtruncbuf(vp, cred, p, vap->va_size, DEV_BSIZE);
+			error = vtruncbuf(vp, td, vap->va_size, DEV_BSIZE);
 			if (error)
 				return (error);
 #else /* defined(__NetBSD__) */
@@ -649,16 +650,16 @@ hpfs_inactive(ap)
 		vprint("hpfs_inactive: pushing active", vp);
 
 	if (hp->h_flag & H_INVAL) {
-		VOP__UNLOCK(vp,0,ap->a_p);
+		VOP__UNLOCK(vp,0,ap->a_td);
 #if defined(__FreeBSD__)
-		vrecycle(vp, NULL, ap->a_p);
+		vrecycle(vp, NULL, ap->a_td);
 #else /* defined(__NetBSD__) */
 		vgone(vp);
 #endif
 		return (0);
 	}
 
-	VOP__UNLOCK(vp,0,ap->a_p);
+	VOP__UNLOCK(vp,0,ap->a_td);
 	return (0);
 }
 
@@ -759,7 +760,7 @@ hpfs_access(ap)
 		struct vnode *a_vp;
 		int  a_mode;
 		struct ucred *a_cred;
-		struct proc *a_p;
+		struct proc *a_td;
 	} */ *ap;
 {
 	struct vnode *vp = ap->a_vp;
@@ -838,7 +839,7 @@ hpfs_open(ap)
 		struct vnode *a_vp;
 		int  a_mode;
 		struct ucred *a_cred;
-		struct proc *a_p;
+		struct proc *a_td;
 	} */ *ap;
 {
 #if HPFS_DEBUG
@@ -867,7 +868,7 @@ hpfs_close(ap)
 		struct vnode *a_vp;
 		int  a_fflag;
 		struct ucred *a_cred;
-		struct proc *a_p;
+		struct proc *a_td;
 	} */ *ap;
 {
 #if HPFS_DEBUG
@@ -978,7 +979,7 @@ hpfs_readdir(ap)
 
 dive:
 	dprintf(("[dive 0x%x] ", lsn));
-	error = bread(hp->h_devvp, lsn, D_BSIZE, NOCRED, &bp);
+	error = bread(hp->h_devvp, lsn, D_BSIZE, &bp);
 	if (error) {
 		brelse(bp);
 		return (error);
@@ -1169,7 +1170,7 @@ hpfs_lookup(ap)
 		return (EOPNOTSUPP);
 	}
 
-	error = VOP_ACCESS(dvp, VEXEC, cred, cnp->cn_proc);
+	error = VOP_ACCESS(dvp, VEXEC, cred, cnp->cn_td);
 	if(error)
 		return (error);
 
@@ -1186,17 +1187,17 @@ hpfs_lookup(ap)
 		dprintf(("hpfs_lookup(0x%x,...): .. faked (0x%x)\n",
 			dhp->h_no, dhp->h_fn.fn_parent));
 
-		VOP__UNLOCK(dvp,0,cnp->cn_proc);
+		VOP__UNLOCK(dvp,0,cnp->cn_td);
 
 		error = VFS_VGET(hpmp->hpm_mp,
 				 dhp->h_fn.fn_parent, ap->a_vpp); 
 		if(error) {
-			VOP__LOCK(dvp, 0, cnp->cn_proc);
+			VOP__LOCK(dvp, 0, cnp->cn_td);
 			return(error);
 		}
 
 		if( lockparent && (flags & ISLASTCN) && 
-		    (error = VOP__LOCK(dvp, 0, cnp->cn_proc)) ) {
+		    (error = VOP__LOCK(dvp, 0, cnp->cn_td)) ) {
 			vput( *(ap->a_vpp) );
 			return (error);
 		}
@@ -1212,7 +1213,7 @@ hpfs_lookup(ap)
 			if ((error == ENOENT) && (flags & ISLASTCN) &&
 			    (nameiop == CREATE || nameiop == RENAME)) {
 				if(!lockparent)
-					VOP__UNLOCK(dvp, 0, cnp->cn_proc);
+					VOP__UNLOCK(dvp, 0, cnp->cn_td);
 				cnp->cn_flags |= SAVENAME;
 				return (EJUSTRETURN);
 			}
@@ -1224,7 +1225,7 @@ hpfs_lookup(ap)
 			 dep->de_fnode, dep->de_cpid));
 
 		if (nameiop == DELETE && (flags & ISLASTCN)) {
-			error = VOP_ACCESS(dvp, VWRITE, cred, cnp->cn_proc);
+			error = VOP_ACCESS(dvp, VWRITE, cred, cnp->cn_td);
 			if (error) {
 				brelse(bp);
 				return (error);
@@ -1258,7 +1259,7 @@ hpfs_lookup(ap)
 		brelse(bp);
 
 		if(!lockparent || !(flags & ISLASTCN))
-			VOP__UNLOCK(dvp, 0, cnp->cn_proc);
+			VOP__UNLOCK(dvp, 0, cnp->cn_td);
 		if ((flags & MAKEENTRY) &&
 		    (!(flags & ISLASTCN) || 
 		     (nameiop != DELETE && nameiop != CREATE)))
diff --git a/sys/vfs/isofs/Makefile b/sys/vfs/isofs/Makefile
new file mode 100644
index 0000000000..7c02b9fc35
--- /dev/null
+++ b/sys/vfs/isofs/Makefile
@@ -0,0 +1,6 @@
+# $DragonFly: src/sys/vfs/isofs/Makefile,v 1.1 2003/08/15 07:26:15 dillon Exp $
+#
+
+SUBDIR=cd9660
+
+.include <bsd.subdir.mk>
diff --git a/sys/vfs/mfs/Makefile b/sys/vfs/mfs/Makefile
index a3c7a08b5f..451dc96527 100644
--- a/sys/vfs/mfs/Makefile
+++ b/sys/vfs/mfs/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD: src/sys/modules/mfs/Makefile,v 1.8 1999/12/12 16:47:26 peter Exp $
-# $DragonFly: src/sys/vfs/mfs/Makefile,v 1.2 2003/06/17 04:28:44 dillon Exp $
+# $DragonFly: src/sys/vfs/mfs/Makefile,v 1.3 2003/08/15 07:26:15 dillon Exp $
 
-.PATH:	${.CURDIR}/../../ufs/mfs
 KMOD=	mfs
 SRCS=	vnode_if.h \
 	mfs_vfsops.c mfs_vnops.c opt_mfs.h
diff --git a/sys/vfs/msdosfs/Makefile b/sys/vfs/msdosfs/Makefile
index c2ac5f0504..c187325689 100644
--- a/sys/vfs/msdosfs/Makefile
+++ b/sys/vfs/msdosfs/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD: src/sys/modules/msdos/Makefile,v 1.10.2.2 2002/12/01 09:01:08 nyan Exp $
-# $DragonFly: src/sys/vfs/msdosfs/Makefile,v 1.2 2003/06/17 04:28:45 dillon Exp $
+# $DragonFly: src/sys/vfs/msdosfs/Makefile,v 1.3 2003/08/15 07:26:15 dillon Exp $
 
-.PATH:	${.CURDIR}/../../msdosfs
 KMOD=	msdos
 SRCS=	vnode_if.h \
 	msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
diff --git a/sys/vfs/nfs/Makefile b/sys/vfs/nfs/Makefile
index 4c6ee6b199..4d79f876c6 100644
--- a/sys/vfs/nfs/Makefile
+++ b/sys/vfs/nfs/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD: src/sys/modules/nfs/Makefile,v 1.16 1999/12/12 20:34:06 peter Exp $
-# $DragonFly: src/sys/vfs/nfs/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# $DragonFly: src/sys/vfs/nfs/Makefile,v 1.3 2003/08/15 07:26:15 dillon Exp $
 
-.PATH: ${.CURDIR}/../../nfs
 KMOD=	nfs
 SRCS=	vnode_if.h \
 	nfs_bio.c nfs_node.c nfs_nqlease.c nfs_serv.c nfs_socket.c \
diff --git a/sys/vfs/ntfs/Makefile b/sys/vfs/ntfs/Makefile
index ffa16b09d8..bcf149bc9d 100644
--- a/sys/vfs/ntfs/Makefile
+++ b/sys/vfs/ntfs/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD: src/sys/modules/ntfs/Makefile,v 1.5 1999/12/12 20:34:07 peter Exp $
-# $DragonFly: src/sys/vfs/ntfs/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# $DragonFly: src/sys/vfs/ntfs/Makefile,v 1.3 2003/08/15 07:26:15 dillon Exp $
 
-.PATH:	${.CURDIR}/../../ntfs
 KMOD=	ntfs
 SRCS=	vnode_if.h \
 	ntfs_vfsops.c ntfs_vnops.c ntfs_subr.c ntfs_ihash.c \
diff --git a/sys/vfs/nullfs/Makefile b/sys/vfs/nullfs/Makefile
index 737806dfe4..87133760b4 100644
--- a/sys/vfs/nullfs/Makefile
+++ b/sys/vfs/nullfs/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD: src/sys/modules/nullfs/Makefile,v 1.10 1999/12/12 16:47:29 peter Exp $
-# $DragonFly: src/sys/vfs/nullfs/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# $DragonFly: src/sys/vfs/nullfs/Makefile,v 1.3 2003/08/15 07:26:15 dillon Exp $
 
-.PATH:	${.CURDIR}/../../miscfs/nullfs
 KMOD=	null
 SRCS=	vnode_if.h \
 	null_subr.c null_vfsops.c null_vnops.c
diff --git a/sys/vfs/nwfs/Makefile b/sys/vfs/nwfs/Makefile
index 7bc9bdc029..cc2b59568e 100644
--- a/sys/vfs/nwfs/Makefile
+++ b/sys/vfs/nwfs/Makefile
@@ -1,7 +1,5 @@
-#	$FreeBSD: src/sys/modules/nwfs/Makefile,v 1.5 1999/12/12 20:34:08 peter Exp $
-#	$DragonFly: src/sys/vfs/nwfs/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
-
-.PATH:	${.CURDIR}/../../nwfs
+# $FreeBSD: src/sys/modules/nwfs/Makefile,v 1.5 1999/12/12 20:34:08 peter Exp $
+# $DragonFly: src/sys/vfs/nwfs/Makefile,v 1.3 2003/08/15 07:26:15 dillon Exp $
 
 KMOD=	nwfs
 KMODDEPS= ncp
diff --git a/sys/vfs/portal/Makefile b/sys/vfs/portal/Makefile
index ae3f8caaf3..77d6189ab1 100644
--- a/sys/vfs/portal/Makefile
+++ b/sys/vfs/portal/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD: src/sys/modules/portal/Makefile,v 1.7 1999/12/12 20:34:09 peter Exp $
-# $DragonFly: src/sys/vfs/portal/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# $DragonFly: src/sys/vfs/portal/Makefile,v 1.3 2003/08/15 07:26:15 dillon Exp $
 
-.PATH:	${.CURDIR}/../../miscfs/portal
 KMOD=	portal
 SRCS=	vnode_if.h \
 	portal_vfsops.c portal_vnops.c
diff --git a/sys/vfs/procfs/Makefile b/sys/vfs/procfs/Makefile
index fb8fcb4898..a66f9ceb9f 100644
--- a/sys/vfs/procfs/Makefile
+++ b/sys/vfs/procfs/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD: src/sys/modules/procfs/Makefile,v 1.18 1999/12/12 20:34:10 peter Exp $
-# $DragonFly: src/sys/vfs/procfs/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# $DragonFly: src/sys/vfs/procfs/Makefile,v 1.3 2003/08/15 07:26:15 dillon Exp $
 
-.PATH:	${.CURDIR}/../../miscfs/procfs
 KMOD=	procfs
 SRCS=	vnode_if.h \
 	procfs_ctl.c procfs_map.c procfs_note.c procfs_rlimit.c \
diff --git a/sys/vfs/smbfs/Makefile b/sys/vfs/smbfs/Makefile
index e4c60ebbb2..5b8fb64b8b 100644
--- a/sys/vfs/smbfs/Makefile
+++ b/sys/vfs/smbfs/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD: src/sys/modules/smbfs/Makefile,v 1.1.2.4 2002/03/26 10:12:29 ume Exp $
-# $DragonFly: src/sys/vfs/smbfs/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# $DragonFly: src/sys/vfs/smbfs/Makefile,v 1.3 2003/08/15 07:26:15 dillon Exp $
 
 .PATH:	${.CURDIR}/../../crypto/des \
 	${.CURDIR}/../../crypto/des/arch/${MACHINE_ARCH} \
 	${.CURDIR}/../../kern \
 	${.CURDIR}/../../libkern \
 	${.CURDIR}/../../netsmb \
-	${.CURDIR}/../../fs/smbfs
+	${.CURDIR}/../../netproto/smb
 
 KMOD=	smbfs
 KMODDEPS=	libiconv libmchain
diff --git a/sys/vfs/umapfs/Makefile b/sys/vfs/umapfs/Makefile
index 1168c8a09d..1998956d01 100644
--- a/sys/vfs/umapfs/Makefile
+++ b/sys/vfs/umapfs/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD: src/sys/modules/umapfs/Makefile,v 1.8 1999/12/12 16:47:33 peter Exp $
-# $DragonFly: src/sys/vfs/umapfs/Attic/Makefile,v 1.2 2003/06/17 04:28:47 dillon Exp $
+# $DragonFly: src/sys/vfs/umapfs/Attic/Makefile,v 1.3 2003/08/15 07:26:16 dillon Exp $
 
-.PATH:	${.CURDIR}/../../miscfs/umapfs
 KMOD=	umap
 SRCS=	vnode_if.h \
 	umap_subr.c umap_vfsops.c umap_vnops.c
diff --git a/sys/vfs/union/Makefile b/sys/vfs/union/Makefile
index 9f92a57011..c27b450394 100644
--- a/sys/vfs/union/Makefile
+++ b/sys/vfs/union/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD: src/sys/modules/union/Makefile,v 1.7 1999/12/12 20:34:11 peter Exp $
-# $DragonFly: src/sys/vfs/union/Makefile,v 1.2 2003/06/17 04:28:47 dillon Exp $
+# $DragonFly: src/sys/vfs/union/Makefile,v 1.3 2003/08/15 07:26:16 dillon Exp $
 
-.PATH:	${.CURDIR}/../../miscfs/union
 KMOD=	union
 SRCS=	vnode_if.h \
 	union_subr.c union_vfsops.c union_vnops.c