X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/b702c21db8cef3072e2845d46ab411775f9ec58c..6dfd1492a7a9868989c965b21ffe9f62aca6cef1:/usr/src/sys/ufs/ffs/ufs_vnops.c

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index 89fb338a44..5a5baf144c 100644
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,115 +4,77 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)ufs_vnops.c	7.45 (Berkeley) %G%
+ *	@(#)ufs_vnops.c	7.66 (Berkeley) %G%
  */
 
-#include "param.h"
-#include "systm.h"
-#include "user.h"
-#include "kernel.h"
-#include "file.h"
-#include "stat.h"
-#include "buf.h"
-#include "proc.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "conf.h"
-#include "mount.h"
-#include "vnode.h"
-#include "specdev.h"
-#include "../ufs/quota.h"
-#include "../ufs/inode.h"
-#include "../ufs/fs.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/namei.h>
+#include <sys/resourcevar.h>
+#include <sys/kernel.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
+#include <sys/conf.h>
+#include <sys/mount.h>
+#include <sys/vnode.h>
+#include <sys/specdev.h>
+#include <sys/fifo.h>
+#include <sys/malloc.h>
+
+#include <ufs/ufs/lockf.h>
+#include <ufs/ufs/quota.h>
+#include <ufs/ufs/inode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ufs/ufsmount.h>
+#include <ufs/ufs/ufs_extern.h>
+
+static int ufs_chmod __P((struct vnode *, int, struct proc *));
+static int ufs_chown __P((struct vnode *, u_int, u_int, struct proc *));
 
-/*
- * Global vfs data structures for ufs
- */
-
-int	ufs_lookup(),
-	ufs_create(),
-	ufs_mknod(),
-	ufs_open(),
-	ufs_close(),
-	ufs_access(),
-	ufs_getattr(),
-	ufs_setattr(),
-	ufs_read(),
-	ufs_write(),
-	ufs_ioctl(),
-	ufs_select(),
-	ufs_mmap(),
-	ufs_fsync(),
-	ufs_seek(),
-	ufs_remove(),
-	ufs_link(),
-	ufs_rename(),
-	ufs_mkdir(),
-	ufs_rmdir(),
-	ufs_symlink(),
-	ufs_readdir(),
-	ufs_readlink(),
-	ufs_abortop(),
-	ufs_inactive(),
-	ufs_reclaim(),
-	ufs_lock(),
-	ufs_unlock(),
-	ufs_bmap(),
-	ufs_strategy(),
-	ufs_print(),
-	ufs_islocked();
-
-struct vnodeops ufs_vnodeops = {
-	ufs_lookup,		/* lookup */
-	ufs_create,		/* create */
-	ufs_mknod,		/* mknod */
-	ufs_open,		/* open */
-	ufs_close,		/* close */
+#ifdef FIFO
+struct vnodeops fifo_inodeops = {
+	fifo_lookup,		/* lookup */
+	fifo_create,		/* create */
+	fifo_mknod,		/* mknod */
+	fifo_open,		/* open */
+	ufsfifo_close,		/* close */
 	ufs_access,		/* access */
 	ufs_getattr,		/* getattr */
 	ufs_setattr,		/* setattr */
-	ufs_read,		/* read */
-	ufs_write,		/* write */
-	ufs_ioctl,		/* ioctl */
-	ufs_select,		/* select */
-	ufs_mmap,		/* mmap */
-	ufs_fsync,		/* fsync */
-	ufs_seek,		/* seek */
-	ufs_remove,		/* remove */
-	ufs_link,		/* link */
-	ufs_rename,		/* rename */
-	ufs_mkdir,		/* mkdir */
-	ufs_rmdir,		/* rmdir */
-	ufs_symlink,		/* symlink */
-	ufs_readdir,		/* readdir */
-	ufs_readlink,		/* readlink */
-	ufs_abortop,		/* abortop */
+	ufsfifo_read,		/* read */
+	ufsfifo_write,		/* write */
+	fifo_ioctl,		/* ioctl */
+	fifo_select,		/* select */
+	fifo_mmap,		/* mmap */
+	fifo_fsync,		/* fsync */
+	fifo_seek,		/* seek */
+	fifo_remove,		/* remove */
+	fifo_link,		/* link */
+	fifo_rename,		/* rename */
+	fifo_mkdir,		/* mkdir */
+	fifo_rmdir,		/* rmdir */
+	fifo_symlink,		/* symlink */
+	fifo_readdir,		/* readdir */
+	fifo_readlink,		/* readlink */
+	fifo_abortop,		/* abortop */
 	ufs_inactive,		/* inactive */
 	ufs_reclaim,		/* reclaim */
 	ufs_lock,		/* lock */
 	ufs_unlock,		/* unlock */
-	ufs_bmap,		/* bmap */
-	ufs_strategy,		/* strategy */
+	fifo_bmap,		/* bmap */
+	fifo_strategy,		/* strategy */
 	ufs_print,		/* print */
 	ufs_islocked,		/* islocked */
+	fifo_advlock,		/* advlock */
 };
-
-int	spec_lookup(),
-	spec_open(),
-	ufsspec_read(),
-	ufsspec_write(),
-	spec_strategy(),
-	spec_bmap(),
-	spec_ioctl(),
-	spec_select(),
-	ufsspec_close(),
-	spec_badop(),
-	spec_nullop();
+#endif /* FIFO */
 
 struct vnodeops spec_inodeops = {
 	spec_lookup,		/* lookup */
-	spec_badop,		/* create */
-	spec_badop,		/* mknod */
+	spec_create,		/* create */
+	spec_mknod,		/* mknod */
 	spec_open,		/* open */
 	ufsspec_close,		/* close */
 	ufs_access,		/* access */
@@ -122,18 +84,18 @@ struct vnodeops spec_inodeops = {
 	ufsspec_write,		/* write */
 	spec_ioctl,		/* ioctl */
 	spec_select,		/* select */
-	spec_badop,		/* mmap */
-	spec_nullop,		/* fsync */
-	spec_badop,		/* seek */
-	spec_badop,		/* remove */
-	spec_badop,		/* link */
-	spec_badop,		/* rename */
-	spec_badop,		/* mkdir */
-	spec_badop,		/* rmdir */
-	spec_badop,		/* symlink */
-	spec_badop,		/* readdir */
-	spec_badop,		/* readlink */
-	spec_badop,		/* abortop */
+	spec_mmap,		/* mmap */
+	spec_fsync,		/* fsync */
+	spec_seek,		/* seek */
+	spec_remove,		/* remove */
+	spec_link,		/* link */
+	spec_rename,		/* rename */
+	spec_mkdir,		/* mkdir */
+	spec_rmdir,		/* rmdir */
+	spec_symlink,		/* symlink */
+	spec_readdir,		/* readdir */
+	spec_readlink,		/* readlink */
+	spec_abortop,		/* abortop */
 	ufs_inactive,		/* inactive */
 	ufs_reclaim,		/* reclaim */
 	ufs_lock,		/* lock */
@@ -142,57 +104,9 @@ struct vnodeops spec_inodeops = {
 	spec_strategy,		/* strategy */
 	ufs_print,		/* print */
 	ufs_islocked,		/* islocked */
+	spec_advlock,		/* advlock */
 };
 
-#ifdef FIFO
-int	fifo_lookup(),
-	fifo_open(),
-	ufsfifo_read(),
-	ufsfifo_write(),
-	fifo_bmap(),
-	fifo_ioctl(),
-	fifo_select(),
-	ufsfifo_close(),
-	fifo_print(),
-	fifo_badop(),
-	fifo_nullop();
-
-struct vnodeops fifo_inodeops = {
-	fifo_lookup,		/* lookup */
-	fifo_badop,		/* create */
-	fifo_badop,		/* mknod */
-	fifo_open,		/* open */
-	ufsfifo_close,		/* close */
-	ufs_access,		/* access */
-	ufs_getattr,		/* getattr */
-	ufs_setattr,		/* setattr */
-	ufsfifo_read,		/* read */
-	ufsfifo_write,		/* write */
-	fifo_ioctl,		/* ioctl */
-	fifo_select,		/* select */
-	fifo_badop,		/* mmap */
-	fifo_nullop,		/* fsync */
-	fifo_badop,		/* seek */
-	fifo_badop,		/* remove */
-	fifo_badop,		/* link */
-	fifo_badop,		/* rename */
-	fifo_badop,		/* mkdir */
-	fifo_badop,		/* rmdir */
-	fifo_badop,		/* symlink */
-	fifo_badop,		/* readdir */
-	fifo_badop,		/* readlink */
-	fifo_badop,		/* abortop */
-	ufs_inactive,		/* inactive */
-	ufs_reclaim,		/* reclaim */
-	ufs_lock,		/* lock */
-	ufs_unlock,		/* unlock */
-	fifo_bmap,		/* bmap */
-	fifo_badop,		/* strategy */
-	ufs_print,		/* print */
-	ufs_islocked,		/* islocked */
-};
-#endif /* FIFO */
-
 enum vtype iftovt_tab[16] = {
 	VNON, VFIFO, VCHR, VNON, VDIR, VNON, VBLK, VNON,
 	VREG, VNON, VLNK, VNON, VSOCK, VNON, VNON, VBAD,
@@ -204,14 +118,19 @@ int	vttoif_tab[9] = {
 /*
  * Create a regular file
  */
-ufs_create(ndp, vap)
+int
+ufs_create(ndp, vap, p)
 	struct nameidata *ndp;
 	struct vattr *vap;
+	struct proc *p;
 {
+	struct ufsmount *ump;
 	struct inode *ip;
 	int error;
 
-	if (error = maknode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &ip))
+	ump = VFSTOUFS(ndp->ni_dvp->v_mount);
+	if (error =
+	    ufs_makeinode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &ip))
 		return (error);
 	ndp->ni_vp = ITOV(ip);
 	return (0);
@@ -221,16 +140,21 @@ ufs_create(ndp, vap)
  * Mknod vnode call
  */
 /* ARGSUSED */
-ufs_mknod(ndp, vap, cred)
+int
+ufs_mknod(ndp, vap, cred, p)
 	struct nameidata *ndp;
-	struct ucred *cred;
 	struct vattr *vap;
+	struct ucred *cred;
+	struct proc *p;
 {
 	register struct vnode *vp;
 	struct inode *ip;
+	struct ufsmount *ump;
 	int error;
 
-	if (error = maknode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &ip))
+	ump = VFSTOUFS(ndp->ni_dvp->v_mount);
+	if (error =
+	    ufs_makeinode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &ip))
 		return (error);
 	ip->i_flag |= IACC|IUPD|ICHG;
 	if (vap->va_rdev != VNOVAL) {
@@ -258,10 +182,12 @@ ufs_mknod(ndp, vap, cred)
  * Nothing to do.
  */
 /* ARGSUSED */
-ufs_open(vp, mode, cred)
+int
+ufs_open(vp, mode, cred, p)
 	struct vnode *vp;
 	int mode;
 	struct ucred *cred;
+	struct proc *p;
 {
 
 	return (0);
@@ -273,13 +199,16 @@ ufs_open(vp, mode, cred)
  * Update the times on the inode.
  */
 /* ARGSUSED */
-ufs_close(vp, fflag, cred)
+int
+ufs_close(vp, fflag, cred, p)
 	struct vnode *vp;
 	int fflag;
 	struct ucred *cred;
+	struct proc *p;
 {
-	register struct inode *ip = VTOI(vp);
+	register struct inode *ip;
 
+	ip = VTOI(vp);
 	if (vp->v_usecount > 1 && !(ip->i_flag & ILOCKED))
 		ITIMES(ip, &time, &time);
 	return (0);
@@ -290,10 +219,12 @@ ufs_close(vp, fflag, cred)
  * The mode is shifted to select the owner/group/other fields. The
  * super user is granted all permissions.
  */
-ufs_access(vp, mode, cred)
+int
+ufs_access(vp, mode, cred, p)
 	struct vnode *vp;
 	register int mode;
 	struct ucred *cred;
+	struct proc *p;
 {
 	register struct inode *ip = VTOI(vp);
 	register gid_t *gp;
@@ -340,13 +271,16 @@ found:
 }
 
 /* ARGSUSED */
-ufs_getattr(vp, vap, cred)
+int
+ufs_getattr(vp, vap, cred, p)
 	struct vnode *vp;
 	register struct vattr *vap;
 	struct ucred *cred;
+	struct proc *p;
 {
-	register struct inode *ip = VTOI(vp);
+	register struct inode *ip;
 
+	ip = VTOI(vp);
 	ITIMES(ip, &time, &time);
 	/*
 	 * Copy from inode table
@@ -378,7 +312,7 @@ ufs_getattr(vp, vap, cred)
 	else if (vp->v_type == VCHR)
 		vap->va_blocksize = MAXBSIZE;
 	else
-		vap->va_blocksize = ip->i_fs->fs_bsize;
+		vap->va_blocksize = vp->v_mount->mnt_stat.f_bsize;
 	vap->va_bytes = dbtob(ip->i_blocks);
 	vap->va_bytes_rsv = 0;
 	vap->va_type = vp->v_type;
@@ -388,16 +322,19 @@ ufs_getattr(vp, vap, cred)
 /*
  * Set attribute vnode op. called from several syscalls
  */
-ufs_setattr(vp, vap, cred)
+int
+ufs_setattr(vp, vap, cred, p)
 	register struct vnode *vp;
 	register struct vattr *vap;
 	register struct ucred *cred;
+	struct proc *p;
 {
-	register struct inode *ip = VTOI(vp);
-	int error = 0;
+	register struct inode *ip;
+	struct ufsmount *ump;
+	int error;
 
 	/*
-	 * Check for unsetable attributes.
+	 * Check for unsettable attributes.
 	 */
 	if ((vap->va_type != VNON) || (vap->va_nlink != VNOVAL) ||
 	    (vap->va_fsid != VNOVAL) || (vap->va_fileid != VNOVAL) ||
@@ -409,31 +346,36 @@ ufs_setattr(vp, vap, cred)
 	 * Go through the fields and update iff not VNOVAL.
 	 */
 	if (vap->va_uid != (u_short)VNOVAL || vap->va_gid != (u_short)VNOVAL)
-		if (error = chown1(vp, vap->va_uid, vap->va_gid, cred))
+		if (error = ufs_chown(vp, vap->va_uid, vap->va_gid, p))
 			return (error);
+	ip = VTOI(vp);
+	ump = VFSTOUFS(vp->v_mount);
 	if (vap->va_size != VNOVAL) {
 		if (vp->v_type == VDIR)
 			return (EISDIR);
-		if (error = itrunc(ip, vap->va_size, 0)) /* XXX IO_SYNC? */
+		if (error =
+		    (ump->um_itrunc)(ip, vap->va_size, 0)) /* XXX IO_SYNC? */
 			return (error);
 	}
 	if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) {
 		if (cred->cr_uid != ip->i_uid &&
-		    (error = suser(cred, &u.u_acflag)))
+		    (error = suser(cred, &p->p_acflag)))
 			return (error);
 		if (vap->va_atime.tv_sec != VNOVAL)
 			ip->i_flag |= IACC;
 		if (vap->va_mtime.tv_sec != VNOVAL)
 			ip->i_flag |= IUPD;
 		ip->i_flag |= ICHG;
-		if (error = iupdat(ip, &vap->va_atime, &vap->va_mtime, 1))
+		if (error =
+		    (ump->um_iupdat)(ip, &vap->va_atime, &vap->va_mtime, 1))
 			return (error);
 	}
+	error = 0;
 	if (vap->va_mode != (u_short)VNOVAL)
-		error = chmod1(vp, (int)vap->va_mode, cred);
+		error = ufs_chmod(vp, (int)vap->va_mode, p);
 	if (vap->va_flags != VNOVAL) {
 		if (cred->cr_uid != ip->i_uid &&
-		    (error = suser(cred, &u.u_acflag)))
+		    (error = suser(cred, &p->p_acflag)))
 			return (error);
 		if (cred->cr_uid == 0) {
 			ip->i_flags = vap->va_flags;
@@ -450,28 +392,30 @@ ufs_setattr(vp, vap, cred)
  * Change the mode on a file.
  * Inode must be locked before calling.
  */
-chmod1(vp, mode, cred)
+int
+ufs_chmod(vp, mode, p)
 	register struct vnode *vp;
 	register int mode;
-	struct ucred *cred;
+	struct proc *p;
 {
+	register struct ucred *cred = p->p_ucred;
 	register struct inode *ip = VTOI(vp);
 	int error;
 
 	if (cred->cr_uid != ip->i_uid &&
-	    (error = suser(cred, &u.u_acflag)))
+	    (error = suser(cred, &p->p_acflag)))
 		return (error);
-	ip->i_mode &= ~07777;
 	if (cred->cr_uid) {
-		if (vp->v_type != VDIR)
-			mode &= ~ISVTX;
-		if (!groupmember(ip->i_gid, cred))
-			mode &= ~ISGID;
+		if (vp->v_type != VDIR && (mode & ISVTX))
+			return (EFTYPE);
+		if (!groupmember(ip->i_gid, cred) && (mode & ISGID))
+			return (EPERM);
 	}
+	ip->i_mode &= ~07777;
 	ip->i_mode |= mode & 07777;
 	ip->i_flag |= ICHG;
 	if ((vp->v_flag & VTEXT) && (ip->i_mode & ISVTX) == 0)
-		xrele(vp);
+		(void) vnode_pager_uncache(vp);
 	return (0);
 }
 
@@ -479,13 +423,15 @@ chmod1(vp, mode, cred)
  * Perform chown operation on inode ip;
  * inode must be locked prior to call.
  */
-chown1(vp, uid, gid, cred)
+int
+ufs_chown(vp, uid, gid, p)
 	register struct vnode *vp;
-	uid_t uid;
-	gid_t gid;
-	struct ucred *cred;
+	u_int uid;
+	u_int gid;
+	struct proc *p;
 {
 	register struct inode *ip = VTOI(vp);
+	register struct ucred *cred = p->p_ucred;
 	uid_t ouid;
 	gid_t ogid;
 	int error = 0;
@@ -505,7 +451,7 @@ chown1(vp, uid, gid, cred)
 	 */
 	if ((cred->cr_uid != ip->i_uid || uid != ip->i_uid ||
 	    !groupmember((gid_t)gid, cred)) &&
-	    (error = suser(cred, &u.u_acflag)))
+	    (error = suser(cred, &p->p_acflag)))
 		return (error);
 	ouid = ip->i_uid;
 	ogid = ip->i_gid;
@@ -580,180 +526,33 @@ good:
 	return (0);
 }
 
-/*
- * Vnode op for reading.
- */
 /* ARGSUSED */
-ufs_read(vp, uio, ioflag, cred)
-	struct vnode *vp;
-	register struct uio *uio;
-	int ioflag;
-	struct ucred *cred;
-{
-	register struct inode *ip = VTOI(vp);
-	register struct fs *fs;
-	struct buf *bp;
-	daddr_t lbn, bn, rablock;
-	int size, diff, error = 0;
-	long n, on, type;
-
-	if (uio->uio_rw != UIO_READ)
-		panic("ufs_read mode");
-	type = ip->i_mode & IFMT;
-	if (type != IFDIR && type != IFREG && type != IFLNK)
-		panic("ufs_read type");
-	if (uio->uio_resid == 0)
-		return (0);
-	if (uio->uio_offset < 0)
-		return (EINVAL);
-	ip->i_flag |= IACC;
-	fs = ip->i_fs;
-	do {
-		lbn = lblkno(fs, uio->uio_offset);
-		on = blkoff(fs, uio->uio_offset);
-		n = MIN((unsigned)(fs->fs_bsize - on), uio->uio_resid);
-		diff = ip->i_size - uio->uio_offset;
-		if (diff <= 0)
-			return (0);
-		if (diff < n)
-			n = diff;
-		size = blksize(fs, ip, lbn);
-		rablock = lbn + 1;
-		if (vp->v_lastr + 1 == lbn &&
-		    lblktosize(fs, rablock) < ip->i_size)
-			error = breada(ITOV(ip), lbn, size, rablock,
-				blksize(fs, ip, rablock), NOCRED, &bp);
-		else
-			error = bread(ITOV(ip), lbn, size, NOCRED, &bp);
-		vp->v_lastr = lbn;
-		n = MIN(n, size - bp->b_resid);
-		if (error) {
-			brelse(bp);
-			return (error);
-		}
-		error = uiomove(bp->b_un.b_addr + on, (int)n, uio);
-		if (n + on == fs->fs_bsize || uio->uio_offset == ip->i_size)
-			bp->b_flags |= B_AGE;
-		brelse(bp);
-	} while (error == 0 && uio->uio_resid > 0 && n != 0);
-	return (error);
-}
-
-/*
- * Vnode op for writing.
- */
-ufs_write(vp, uio, ioflag, cred)
-	register struct vnode *vp;
-	struct uio *uio;
-	int ioflag;
-	struct ucred *cred;
-{
-	register struct inode *ip = VTOI(vp);
-	register struct fs *fs;
-	struct buf *bp;
-	daddr_t lbn, bn;
-	u_long osize;
-	int i, n, on, flags;
-	int count, size, resid, error = 0;
-
-	if (uio->uio_rw != UIO_WRITE)
-		panic("ufs_write mode");
-	switch (vp->v_type) {
-	case VREG:
-		if (ioflag & IO_APPEND)
-			uio->uio_offset = ip->i_size;
-		/* fall through */
-	case VLNK:
-		break;
-
-	case VDIR:
-		if ((ioflag & IO_SYNC) == 0)
-			panic("ufs_write nonsync dir write");
-		break;
-
-	default:
-		panic("ufs_write type");
-	}
-	if (uio->uio_offset < 0)
-		return (EINVAL);
-	if (uio->uio_resid == 0)
-		return (0);
-	/*
-	 * Maybe this should be above the vnode op call, but so long as
-	 * file servers have no limits, i don't think it matters
-	 */
-	if (vp->v_type == VREG &&
-	    uio->uio_offset + uio->uio_resid >
-	      u.u_rlimit[RLIMIT_FSIZE].rlim_cur) {
-		psignal(u.u_procp, SIGXFSZ);
-		return (EFBIG);
-	}
-	resid = uio->uio_resid;
-	osize = ip->i_size;
-	fs = ip->i_fs;
-	flags = 0;
-	if (ioflag & IO_SYNC)
-		flags = B_SYNC;
-	do {
-		lbn = lblkno(fs, uio->uio_offset);
-		on = blkoff(fs, uio->uio_offset);
-		n = MIN((unsigned)(fs->fs_bsize - on), uio->uio_resid);
-		if (n < fs->fs_bsize)
-			flags |= B_CLRBUF;
-		else
-			flags &= ~B_CLRBUF;
-		if (error = balloc(ip, lbn, (int)(on + n), &bp, flags))
-			break;
-		bn = bp->b_blkno;
-		if (uio->uio_offset + n > ip->i_size)
-			ip->i_size = uio->uio_offset + n;
-		size = blksize(fs, ip, lbn);
-		count = howmany(size, CLBYTES);
-		for (i = 0; i < count; i++)
-			munhash(ip->i_devvp, bn + i * CLBYTES / DEV_BSIZE);
-		n = MIN(n, size - bp->b_resid);
-		error = uiomove(bp->b_un.b_addr + on, n, uio);
-		if (ioflag & IO_SYNC)
-			(void) bwrite(bp);
-		else if (n + on == fs->fs_bsize) {
-			bp->b_flags |= B_AGE;
-			bawrite(bp);
-		} else
-			bdwrite(bp);
-		ip->i_flag |= IUPD|ICHG;
-		if (cred->cr_uid != 0)
-			ip->i_mode &= ~(ISUID|ISGID);
-	} while (error == 0 && uio->uio_resid > 0 && n != 0);
-	if (error && (ioflag & IO_UNIT)) {
-		(void) itrunc(ip, osize, ioflag & IO_SYNC);
-		uio->uio_offset -= resid - uio->uio_resid;
-		uio->uio_resid = resid;
-	}
-	if (!error && (ioflag & IO_SYNC))
-		error = iupdat(ip, &time, &time, 1);
-	return (error);
-}
-
-/* ARGSUSED */
-ufs_ioctl(vp, com, data, fflag, cred)
+int
+ufs_ioctl(vp, com, data, fflag, cred, p)
 	struct vnode *vp;
 	int com;
 	caddr_t data;
 	int fflag;
 	struct ucred *cred;
+	struct proc *p;
 {
 
 	return (ENOTTY);
 }
 
 /* ARGSUSED */
-ufs_select(vp, which, fflags, cred)
+int
+ufs_select(vp, which, fflags, cred, p)
 	struct vnode *vp;
 	int which, fflags;
 	struct ucred *cred;
+	struct proc *p;
 {
 
-	return (1);		/* XXX */
+	/*
+	 * We should really check to see if I/O is possible.
+	 */
+	return (1);
 }
 
 /*
@@ -762,39 +561,24 @@ ufs_select(vp, which, fflags, cred)
  * NB Currently unsupported.
  */
 /* ARGSUSED */
-ufs_mmap(vp, fflags, cred)
+int
+ufs_mmap(vp, fflags, cred, p)
 	struct vnode *vp;
 	int fflags;
 	struct ucred *cred;
+	struct proc *p;
 {
 
 	return (EINVAL);
 }
 
-/*
- * Synch an open file.
- */
-/* ARGSUSED */
-ufs_fsync(vp, fflags, cred, waitfor)
-	struct vnode *vp;
-	int fflags;
-	struct ucred *cred;
-	int waitfor;
-{
-	struct inode *ip = VTOI(vp);
-
-	if (fflags&FWRITE)
-		ip->i_flag |= ICHG;
-	vflushbuf(vp, waitfor == MNT_WAIT ? B_SYNC : 0);
-	return (iupdat(ip, &time, &time, waitfor == MNT_WAIT));
-}
-
 /*
  * Seek on a file
  *
  * Nothing to do, so just return.
  */
 /* ARGSUSED */
+int
 ufs_seek(vp, oldoff, newoff, cred)
 	struct vnode *vp;
 	off_t oldoff, newoff;
@@ -809,15 +593,17 @@ ufs_seek(vp, oldoff, newoff, cred)
  * Hard to avoid races here, especially
  * in unlinking directories.
  */
-ufs_remove(ndp)
+int
+ufs_remove(ndp, p)
 	struct nameidata *ndp;
+	struct proc *p;
 {
 	register struct inode *ip, *dp;
 	int error;
 
 	ip = VTOI(ndp->ni_vp);
 	dp = VTOI(ndp->ni_dvp);
-	error = dirremove(ndp);
+	error = ufs_dirremove(ndp);
 	if (!error) {
 		ip->i_nlink--;
 		ip->i_flag |= ICHG;
@@ -825,35 +611,45 @@ ufs_remove(ndp)
 	if (dp == ip)
 		vrele(ITOV(ip));
 	else
-		iput(ip);
-	iput(dp);
+		ufs_iput(ip);
+	ufs_iput(dp);
 	return (error);
 }
 
 /*
  * link vnode call
  */
-ufs_link(vp, ndp)
+int
+ufs_link(vp, ndp, p)
 	register struct vnode *vp;
 	register struct nameidata *ndp;
+	struct proc *p;
 {
-	register struct inode *ip = VTOI(vp);
+	register struct inode *ip;
+	struct ufsmount *ump;
 	int error;
 
+#ifdef DIANOSTIC
+	if ((ndp->ni_nameiop & HASBUF) == 0)
+		panic("ufs_link: no name");
+#endif
+	ip = VTOI(vp);
+	if ((unsigned short)ip->i_nlink >= LINK_MAX) {
+		free(ndp->ni_pnbuf, M_NAMEI);
+		return (EMLINK);
+	}
 	if (ndp->ni_dvp != vp)
 		ILOCK(ip);
-	if (ip->i_nlink == LINK_MAX - 1) {
-		error = EMLINK;
-		goto out;
-	}
 	ip->i_nlink++;
 	ip->i_flag |= ICHG;
-	error = iupdat(ip, &time, &time, 1);
+	ump = VFSTOUFS(ndp->ni_dvp->v_mount);
+	error = (ump->um_iupdat)(ip, &time, &time, 1);
 	if (!error)
-		error = direnter(ip, ndp);
-out:
+		error = ufs_direnter(ip, ndp);
 	if (ndp->ni_dvp != vp)
 		IUNLOCK(ip);
+	FREE(ndp->ni_pnbuf, M_NAMEI);
+	vput(ndp->ni_dvp);
 	if (error) {
 		ip->i_nlink--;
 		ip->i_flag |= ICHG;
@@ -885,25 +681,47 @@ out:
  *    is different from the source, patch the ".." entry in the
  *    directory.
  */
-ufs_rename(fndp, tndp)
+int
+ufs_rename(fndp, tndp, p)
 	register struct nameidata *fndp, *tndp;
+	struct proc *p;
 {
 	register struct inode *ip, *xp, *dp;
 	struct dirtemplate dirbuf;
+	struct ufsmount *ump;
 	int doingdirectory = 0, oldparent = 0, newparent = 0;
 	int error = 0;
 
+#ifdef DIANOSTIC
+	if ((tndp->ni_nameiop & HASBUF) == 0 ||
+	    (fndp->ni_nameiop & HASBUF) == 0)
+		panic("ufs_rename: no name");
+#endif
 	dp = VTOI(fndp->ni_dvp);
 	ip = VTOI(fndp->ni_vp);
+	/*
+	 * Check if just deleting a link name.
+	 */
+	if (fndp->ni_vp == tndp->ni_vp) {
+		VOP_ABORTOP(tndp);
+		vput(tndp->ni_dvp);
+		vput(tndp->ni_vp);
+		vrele(fndp->ni_dvp);
+		if ((ip->i_mode&IFMT) == IFDIR) {
+			VOP_ABORTOP(fndp);
+			vrele(fndp->ni_vp);
+			return (EINVAL);
+		}
+		doingdirectory = 0;
+		goto unlinkit;
+	}
 	ILOCK(ip);
 	if ((ip->i_mode&IFMT) == IFDIR) {
-		register struct direct *d = &fndp->ni_dent;
-
 		/*
 		 * Avoid ".", "..", and aliases of "." for obvious reasons.
 		 */
-		if ((d->d_namlen == 1 && d->d_name[0] == '.') || dp == ip ||
-		    fndp->ni_isdotdot || (ip->i_flag & IRENAME)) {
+		if ((fndp->ni_namelen == 1 && fndp->ni_ptr[0] == '.') ||
+		    dp == ip || fndp->ni_isdotdot || (ip->i_flag & IRENAME)) {
 			VOP_ABORTOP(tndp);
 			vput(tndp->ni_dvp);
 			if (tndp->ni_vp)
@@ -927,7 +745,8 @@ ufs_rename(fndp, tndp)
 	 */
 	ip->i_nlink++;
 	ip->i_flag |= ICHG;
-	error = iupdat(ip, &time, &time, 1);
+	ump = VFSTOUFS(fndp->ni_dvp->v_mount);
+	error = (ump->um_iupdat)(ip, &time, &time, 1);
 	IUNLOCK(ip);
 
 	/*
@@ -952,23 +771,23 @@ ufs_rename(fndp, tndp)
 		newparent = dp->i_number;
 	if (doingdirectory && newparent) {
 		VOP_LOCK(fndp->ni_vp);
-		error = ufs_access(fndp->ni_vp, VWRITE, tndp->ni_cred);
+		error = ufs_access(fndp->ni_vp, VWRITE, tndp->ni_cred, p);
 		VOP_UNLOCK(fndp->ni_vp);
 		if (error)
 			goto bad;
-		tndp->ni_nameiop = RENAME | LOCKPARENT | LOCKLEAF | NOCACHE;
-		do {
-			dp = VTOI(tndp->ni_dvp);
-			if (xp != NULL)
-				iput(xp);
-			if (error = checkpath(ip, dp, tndp->ni_cred))
-				goto out;
-			if (error = namei(tndp))
-				goto out;
-			xp = NULL;
-			if (tndp->ni_vp)
-				xp = VTOI(tndp->ni_vp);
-		} while (dp != VTOI(tndp->ni_dvp));
+		if (xp != NULL)
+			ufs_iput(xp);
+		if (error = ufs_checkpath(ip, dp, tndp->ni_cred))
+			goto out;
+		if ((tndp->ni_nameiop & SAVESTART) == 0)
+			panic("ufs_rename: lost to startdir");
+		p->p_spare[1]--;
+		if (error = lookup(tndp, p))
+			goto out;
+		dp = VTOI(tndp->ni_dvp);
+		xp = NULL;
+		if (tndp->ni_vp)
+			xp = VTOI(tndp->ni_vp);
 	}
 	/*
 	 * 2) If target doesn't exist, link the target
@@ -986,12 +805,24 @@ ufs_rename(fndp, tndp)
 		 * parent we don't fool with the link count.
 		 */
 		if (doingdirectory && newparent) {
+			if ((unsigned short)dp->i_nlink >= LINK_MAX) {
+				error = EMLINK;
+				goto bad;
+			}
 			dp->i_nlink++;
 			dp->i_flag |= ICHG;
-			error = iupdat(dp, &time, &time, 1);
+			if (error = (ump->um_iupdat)(dp, &time, &time, 1))
+				goto bad;
 		}
-		if (error = direnter(ip, tndp))
-			goto out;
+		if (error = ufs_direnter(ip, tndp)) {
+			if (doingdirectory && newparent) {
+				dp->i_nlink--;
+				dp->i_flag |= ICHG;
+				(void)(ump->um_iupdat)(dp, &time, &time, 1);
+			}
+			goto bad;
+		}
+		ufs_iput(dp);
 	} else {
 		if (xp->i_dev != dp->i_dev || xp->i_dev != ip->i_dev)
 			panic("rename: EXDEV");
@@ -1013,14 +844,12 @@ ufs_rename(fndp, tndp)
 			goto bad;
 		}
 		/*
-		 * Target must be empty if a directory
-		 * and have no links to it.
-		 * Also, insure source and target are
-		 * compatible (both directories, or both
-		 * not directories).
+		 * Target must be empty if a directory and have no links
+		 * to it. Also, ensure source and target are compatible
+		 * (both directories, or both not directories).
 		 */
 		if ((xp->i_mode&IFMT) == IFDIR) {
-			if (!dirempty(xp, dp->i_number, tndp->ni_cred) || 
+			if (!ufs_dirempty(xp, dp->i_number, tndp->ni_cred) || 
 			    xp->i_nlink > 2) {
 				error = ENOTEMPTY;
 				goto bad;
@@ -1034,8 +863,18 @@ ufs_rename(fndp, tndp)
 			error = EISDIR;
 			goto bad;
 		}
-		if (error = dirrewrite(dp, ip, tndp))
+		if (error = ufs_dirrewrite(dp, ip, tndp))
 			goto bad;
+		/*
+		 * If the target directory is in the same
+		 * directory as the source directory,
+		 * decrement the link count on the parent
+		 * of the target directory.
+		 */
+		 if (doingdirectory && !newparent) {
+			dp->i_nlink--;
+			dp->i_flag |= ICHG;
+		}
 		vput(ITOV(dp));
 		/*
 		 * Adjust the link count of the target to
@@ -1051,26 +890,34 @@ ufs_rename(fndp, tndp)
 		if (doingdirectory) {
 			if (--xp->i_nlink != 0)
 				panic("rename: linked directory");
-			error = itrunc(xp, (u_long)0, IO_SYNC);
+			error = (ump->um_itrunc)(xp, (u_long)0, IO_SYNC);
 		}
 		xp->i_flag |= ICHG;
-		iput(xp);
+		ufs_iput(xp);
 		xp = NULL;
 	}
 
 	/*
 	 * 3) Unlink the source.
 	 */
-	fndp->ni_nameiop = DELETE | LOCKPARENT | LOCKLEAF;
-	(void)namei(fndp);
+unlinkit:
+	fndp->ni_nameiop &= ~MODMASK;
+	fndp->ni_nameiop |= LOCKPARENT | LOCKLEAF;
+	if ((fndp->ni_nameiop & SAVESTART) == 0)
+		panic("ufs_rename: lost from startdir");
+	p->p_spare[1]--;
+	(void) lookup(fndp, p);
 	if (fndp->ni_vp != NULL) {
 		xp = VTOI(fndp->ni_vp);
 		dp = VTOI(fndp->ni_dvp);
 	} else {
-		if (fndp->ni_dvp != NULL)
-			vput(fndp->ni_dvp);
-		xp = NULL;
-		dp = NULL;
+		/*
+		 * From name has disappeared.
+		 */
+		if (doingdirectory)
+			panic("rename: lost dir entry");
+		vrele(ITOV(ip));
+		return (0);
 	}
 	/*
 	 * Ensure that the directory entry still exists and has not
@@ -1098,12 +945,13 @@ ufs_rename(fndp, tndp)
 			error = vn_rdwr(UIO_READ, ITOV(xp), (caddr_t)&dirbuf,
 				sizeof (struct dirtemplate), (off_t)0,
 				UIO_SYSSPACE, IO_NODELOCKED, 
-				tndp->ni_cred, (int *)0);
+				tndp->ni_cred, (int *)0, (struct proc *)0);
 			if (error == 0) {
 				if (dirbuf.dotdot_namlen != 2 ||
 				    dirbuf.dotdot_name[0] != '.' ||
 				    dirbuf.dotdot_name[1] != '.') {
-					dirbad(xp, 12, "rename: mangled dir");
+					ufs_dirbad(xp, 12,
+					    "rename: mangled dir");
 				} else {
 					dirbuf.dotdot_ino = newparent;
 					(void) vn_rdwr(UIO_WRITE, ITOV(xp),
@@ -1111,12 +959,13 @@ ufs_rename(fndp, tndp)
 					    sizeof (struct dirtemplate),
 					    (off_t)0, UIO_SYSSPACE,
 					    IO_NODELOCKED|IO_SYNC,
-					    tndp->ni_cred, (int *)0);
+					    tndp->ni_cred, (int *)0,
+					    (struct proc *)0);
 					cache_purge(ITOV(dp));
 				}
 			}
 		}
-		error = dirremove(fndp);
+		error = ufs_dirremove(fndp);
 		if (!error) {
 			xp->i_nlink--;
 			xp->i_flag |= ICHG;
@@ -1144,7 +993,7 @@ out:
 /*
  * A virgin directory (no blushing please).
  */
-struct dirtemplate mastertemplate = {
+static struct dirtemplate mastertemplate = {
 	0, 12, 1, ".",
 	0, DIRBLKSIZ - 12, 2, ".."
 };
@@ -1152,30 +1001,42 @@ struct dirtemplate mastertemplate = {
 /*
  * Mkdir system call
  */
-ufs_mkdir(ndp, vap)
+int
+ufs_mkdir(ndp, vap, p)
 	struct nameidata *ndp;
 	struct vattr *vap;
+	struct proc *p;
 {
 	register struct inode *ip, *dp;
 	struct inode *tip;
+	struct ufsmount *ump;
 	struct vnode *dvp;
 	struct dirtemplate dirtemplate;
 	int error;
 	int dmode;
 
+#ifdef DIANOSTIC
+	if ((ndp->ni_nameiop & HASBUF) == 0)
+		panic("ufs_mkdir: no name");
+#endif
 	dvp = ndp->ni_dvp;
 	dp = VTOI(dvp);
+	if ((unsigned short)dp->i_nlink >= LINK_MAX) {
+		free(ndp->ni_pnbuf, M_NAMEI);
+		ufs_iput(dp);
+		return (EMLINK);
+	}
 	dmode = vap->va_mode&0777;
 	dmode |= IFDIR;
 	/*
-	 * Must simulate part of maknode here
-	 * in order to acquire the inode, but
-	 * not have it entered in the parent
-	 * directory.  The entry is made later
-	 * after writing "." and ".." entries out.
+	 * Must simulate part of maknode here to acquire the inode, but
+	 * not have it entered in the parent directory. The entry is made
+	 * later after writing "." and ".." entries.
 	 */
-	if (error = ialloc(dp, dirpref(dp->i_fs), dmode, ndp->ni_cred, &tip)) {
-		iput(dp);
+	ump = VFSTOUFS(ndp->ni_dvp->v_mount);
+	if (error = (ump->um_ialloc)(dp, dmode, ndp->ni_cred, &tip)) {
+		free(ndp->ni_pnbuf, M_NAMEI);
+		ufs_iput(dp);
 		return (error);
 	}
 	ip = tip;
@@ -1184,9 +1045,10 @@ ufs_mkdir(ndp, vap)
 #ifdef QUOTA
 	if ((error = getinoquota(ip)) ||
 	    (error = chkiq(ip, 1, ndp->ni_cred, 0))) {
-		ifree(ip, ip->i_number, dmode);
-		iput(ip);
-		iput(dp);
+		free(ndp->ni_pnbuf, M_NAMEI);
+		(ump->um_ifree)(ip, ip->i_number, dmode);
+		ufs_iput(ip);
+		ufs_iput(dp);
 		return (error);
 	}
 #endif
@@ -1194,7 +1056,7 @@ ufs_mkdir(ndp, vap)
 	ip->i_mode = dmode;
 	ITOV(ip)->v_type = VDIR;	/* Rest init'd in iget() */
 	ip->i_nlink = 2;
-	error = iupdat(ip, &time, &time, 1);
+	error = (ump->um_iupdat)(ip, &time, &time, 1);
 
 	/*
 	 * Bump link count in parent directory
@@ -1204,79 +1066,70 @@ ufs_mkdir(ndp, vap)
 	 */
 	dp->i_nlink++;
 	dp->i_flag |= ICHG;
-	error = iupdat(dp, &time, &time, 1);
+	if (error = (ump->um_iupdat)(dp, &time, &time, 1))
+		goto bad;
 
-	/*
-	 * Initialize directory with "."
-	 * and ".." from static template.
-	 */
+	/* Initialize directory with "." and ".." from static template. */
 	dirtemplate = mastertemplate;
 	dirtemplate.dot_ino = ip->i_number;
 	dirtemplate.dotdot_ino = dp->i_number;
 	error = vn_rdwr(UIO_WRITE, ITOV(ip), (caddr_t)&dirtemplate,
-		sizeof (dirtemplate), (off_t)0, UIO_SYSSPACE,
-		IO_NODELOCKED|IO_SYNC, ndp->ni_cred, (int *)0);
+	    sizeof (dirtemplate), (off_t)0, UIO_SYSSPACE,
+	    IO_NODELOCKED|IO_SYNC, ndp->ni_cred, (int *)0, (struct proc *)0);
 	if (error) {
 		dp->i_nlink--;
 		dp->i_flag |= ICHG;
 		goto bad;
 	}
-	if (DIRBLKSIZ > dp->i_fs->fs_fsize) {
-		panic("mkdir: blksize");     /* XXX - should grow w/balloc() */
-	} else {
+	if (DIRBLKSIZ > ump->um_mountp->mnt_stat.f_fsize)
+		panic("ufs_mkdir: blksize"); /* XXX should grow with balloc() */
+	else {
 		ip->i_size = DIRBLKSIZ;
 		ip->i_flag |= ICHG;
 	}
-	/*
-	 * Directory all set up, now
-	 * install the entry for it in
-	 * the parent directory.
-	 */
-	error = direnter(ip, ndp);
-	dp = NULL;
-	if (error) {
-		ndp->ni_nameiop = LOOKUP | NOCACHE;
-		error = namei(ndp);
-		if (!error) {
-			dp = VTOI(ndp->ni_vp);
-			dp->i_nlink--;
-			dp->i_flag |= ICHG;
-		}
+
+	/* Directory set up, now install it's entry in the parent directory. */
+	if (error = ufs_direnter(ip, ndp)) {
+		dp->i_nlink--;
+		dp->i_flag |= ICHG;
 	}
 bad:
 	/*
-	 * No need to do an explicit itrunc here,
-	 * vrele will do this for us because we set
-	 * the link count to 0.
+	 * No need to do an explicit itrunc here, vrele will do this for us
+	 * because we set the link count to 0.
 	 */
 	if (error) {
 		ip->i_nlink = 0;
 		ip->i_flag |= ICHG;
-		iput(ip);
+		ufs_iput(ip);
 	} else
 		ndp->ni_vp = ITOV(ip);
-	if (dp)
-		iput(dp);
+	FREE(ndp->ni_pnbuf, M_NAMEI);
+	ufs_iput(dp);
 	return (error);
 }
 
 /*
  * Rmdir system call.
  */
-ufs_rmdir(ndp)
+int
+ufs_rmdir(ndp, p)
 	register struct nameidata *ndp;
+	struct proc *p;
 {
 	register struct inode *ip, *dp;
-	int error = 0;
+	struct ufsmount *ump;
+	int error;
 
 	ip = VTOI(ndp->ni_vp);
 	dp = VTOI(ndp->ni_dvp);
+	ump = VFSTOUFS(ndp->ni_dvp->v_mount);
 	/*
 	 * No rmdir "." please.
 	 */
 	if (dp == ip) {
 		vrele(ITOV(dp));
-		iput(ip);
+		ufs_iput(ip);
 		return (EINVAL);
 	}
 	/*
@@ -1286,7 +1139,9 @@ ufs_rmdir(ndp)
 	 *  the current directory and thus be
 	 *  non-empty.)
 	 */
-	if (ip->i_nlink != 2 || !dirempty(ip, dp->i_number, ndp->ni_cred)) {
+	error = 0;
+	if (ip->i_nlink != 2 ||
+	    !ufs_dirempty(ip, dp->i_number, ndp->ni_cred)) {
 		error = ENOTEMPTY;
 		goto out;
 	}
@@ -1295,12 +1150,12 @@ ufs_rmdir(ndp)
 	 * inode.  If we crash in between, the directory
 	 * will be reattached to lost+found,
 	 */
-	if (error = dirremove(ndp))
+	if (error = ufs_dirremove(ndp))
 		goto out;
 	dp->i_nlink--;
 	dp->i_flag |= ICHG;
 	cache_purge(ITOV(dp));
-	iput(dp);
+	ufs_iput(dp);
 	ndp->ni_dvp = NULL;
 	/*
 	 * Truncate inode.  The only stuff left
@@ -1314,38 +1169,43 @@ ufs_rmdir(ndp)
 	 * worry about them later.
 	 */
 	ip->i_nlink -= 2;
-	error = itrunc(ip, (u_long)0, IO_SYNC);
+	error = (ump->um_itrunc)(ip, (u_long)0, IO_SYNC);
 	cache_purge(ITOV(ip));
 out:
 	if (ndp->ni_dvp)
-		iput(dp);
-	iput(ip);
+		ufs_iput(dp);
+	ufs_iput(ip);
 	return (error);
 }
 
 /*
  * symlink -- make a symbolic link
  */
-ufs_symlink(ndp, vap, target)
+int
+ufs_symlink(ndp, vap, target, p)
 	struct nameidata *ndp;
 	struct vattr *vap;
 	char *target;
+	struct proc *p;
 {
 	struct inode *ip;
+	struct ufsmount *ump;
 	int error;
 
-	error = maknode(IFLNK | vap->va_mode, ndp, &ip);
-	if (error)
+	ump = VFSTOUFS(ndp->ni_dvp->v_mount);
+	if (error = ufs_makeinode(IFLNK | vap->va_mode, ndp, &ip))
 		return (error);
 	error = vn_rdwr(UIO_WRITE, ITOV(ip), target, strlen(target), (off_t)0,
-		UIO_SYSSPACE, IO_NODELOCKED, ndp->ni_cred, (int *)0);
-	iput(ip);
+		UIO_SYSSPACE, IO_NODELOCKED, ndp->ni_cred, (int *)0,
+		(struct proc *)0);
+	ufs_iput(ip);
 	return (error);
 }
 
 /*
  * Vnode op for read and write
  */
+int
 ufs_readdir(vp, uio, cred, eofflagp)
 	struct vnode *vp;
 	register struct uio *uio;
@@ -1361,7 +1221,7 @@ ufs_readdir(vp, uio, cred, eofflagp)
 		return (EINVAL);
 	uio->uio_resid = count;
 	uio->uio_iov->iov_len = count;
-	error = ufs_read(vp, uio, 0, cred);
+	error = VOP_READ(vp, uio, 0, cred);
 	uio->uio_resid += lost;
 	if ((VTOI(vp)->i_size - uio->uio_offset) <= 0)
 		*eofflagp = 1;
@@ -1373,30 +1233,35 @@ ufs_readdir(vp, uio, cred, eofflagp)
 /*
  * Return target name of a symbolic link
  */
+int
 ufs_readlink(vp, uiop, cred)
 	struct vnode *vp;
 	struct uio *uiop;
 	struct ucred *cred;
 {
 
-	return (ufs_read(vp, uiop, 0, cred));
+	return (VOP_READ(vp, uiop, 0, cred));
 }
 
 /*
  * Ufs abort op, called after namei() when a CREATE/DELETE isn't actually
- * done. Nothing to do at the moment.
+ * done. If a buffer has been saved in anticipation of a CREATE, delete it.
  */
 /* ARGSUSED */
+int
 ufs_abortop(ndp)
 	struct nameidata *ndp;
 {
 
+	if ((ndp->ni_nameiop & (HASBUF | SAVESTART)) == HASBUF)
+		FREE(ndp->ni_pnbuf, M_NAMEI);
 	return (0);
 }
 
 /*
  * Lock an inode.
  */
+int
 ufs_lock(vp)
 	struct vnode *vp;
 {
@@ -1409,6 +1274,7 @@ ufs_lock(vp)
 /*
  * Unlock an inode.
  */
+int
 ufs_unlock(vp)
 	struct vnode *vp;
 {
@@ -1423,6 +1289,7 @@ ufs_unlock(vp)
 /*
  * Check for a locked inode.
  */
+int
 ufs_islocked(vp)
 	struct vnode *vp;
 {
@@ -1435,19 +1302,23 @@ ufs_islocked(vp)
 /*
  * Get access to bmap
  */
+int
 ufs_bmap(vp, bn, vpp, bnp)
 	struct vnode *vp;
 	daddr_t bn;
 	struct vnode **vpp;
 	daddr_t *bnp;
 {
-	struct inode *ip = VTOI(vp);
+	struct inode *ip;
+	struct ufsmount *ump;
 
+	ip = VTOI(vp);
 	if (vpp != NULL)
 		*vpp = ip->i_devvp;
 	if (bnp == NULL)
 		return (0);
-	return (bmap(ip, bn, bnp));
+	ump = VFSTOUFS(vp->v_mount);
+	return ((ump->um_bmap)(ip, bn, bnp));
 }
 
 /*
@@ -1456,17 +1327,21 @@ ufs_bmap(vp, bn, vpp, bnp)
  */
 int checkoverlap = 0;
 
+int
 ufs_strategy(bp)
 	register struct buf *bp;
 {
-	register struct inode *ip = VTOI(bp->b_vp);
+	register struct inode *ip;
+	struct ufsmount *ump;
 	struct vnode *vp;
 	int error;
 
+	ip = VTOI(bp->b_vp);
 	if (bp->b_vp->v_type == VBLK || bp->b_vp->v_type == VCHR)
 		panic("ufs_strategy: spec");
 	if (bp->b_blkno == bp->b_lblkno) {
-		if (error = bmap(ip, bp->b_lblkno, &bp->b_blkno))
+		ump = VFSTOUFS(bp->b_vp->v_mount);
+		if (error = (ump->um_bmap)(ip, bp->b_lblkno, &bp->b_blkno))
 			return (error);
 		if ((long)bp->b_blkno == -1)
 			clrbuf(bp);
@@ -1476,43 +1351,20 @@ ufs_strategy(bp)
 		return (0);
 	}
 #ifdef DIAGNOSTIC
-	if (checkoverlap) {
-		register struct buf *ep;
-		struct buf *ebp;
-		daddr_t start, last;
-
-		ebp = &buf[nbuf];
-		start = bp->b_blkno;
-		last = start + btodb(bp->b_bcount) - 1;
-		for (ep = buf; ep < ebp; ep++) {
-			if (ep == bp || (ep->b_flags & B_INVAL) ||
-			    ep->b_vp == NULLVP)
-				continue;
-			if (VOP_BMAP(ep->b_vp, (daddr_t)0, &vp, (daddr_t)0))
-				continue;
-			if (vp != ip->i_devvp)
-				continue;
-			/* look for overlap */
-			if (ep->b_bcount == 0 || ep->b_blkno > last ||
-			    ep->b_blkno + btodb(ep->b_bcount) <= start)
-				continue;
-			vprint("Disk overlap", vp);
-			printf("\tstart %d, end %d overlap start %d, end %d\n",
-				start, last, ep->b_blkno,
-				ep->b_blkno + btodb(ep->b_bcount) - 1);
-			panic("Disk buffer overlap");
-		}
-	}
-#endif /* DIAGNOSTIC */
+	if (checkoverlap && bp->b_vp->v_mount->mnt_stat.f_type == MOUNT_UFS)
+		ffs_checkoverlap(bp, ip);
+#endif
+		
 	vp = ip->i_devvp;
 	bp->b_dev = vp->v_rdev;
-	(*(vp->v_op->vn_strategy))(bp);
+	(vp->v_op->vop_strategy)(bp);
 	return (0);
 }
 
 /*
  * Print out the contents of an inode.
  */
+int
 ufs_print(vp)
 	struct vnode *vp;
 {
@@ -1526,16 +1378,18 @@ ufs_print(vp)
 #endif /* FIFO */
 	printf("%s\n", (ip->i_flag & ILOCKED) ? " (LOCKED)" : "");
 	if (ip->i_spare0 == 0)
-		return;
+		return (0);
 	printf("\towner pid %d", ip->i_spare0);
 	if (ip->i_spare1)
 		printf(" waiting pid %d", ip->i_spare1);
 	printf("\n");
+	return (0);
 }
 
 /*
  * Read wrapper for special devices.
  */
+int
 ufsspec_read(vp, uio, ioflag, cred)
 	struct vnode *vp;
 	struct uio *uio;
@@ -1553,6 +1407,7 @@ ufsspec_read(vp, uio, ioflag, cred)
 /*
  * Write wrapper for special devices.
  */
+int
 ufsspec_write(vp, uio, ioflag, cred)
 	struct vnode *vp;
 	struct uio *uio;
@@ -1572,22 +1427,25 @@ ufsspec_write(vp, uio, ioflag, cred)
  *
  * Update the times on the inode then do device close.
  */
-ufsspec_close(vp, fflag, cred)
+int
+ufsspec_close(vp, fflag, cred, p)
 	struct vnode *vp;
 	int fflag;
 	struct ucred *cred;
+	struct proc *p;
 {
 	register struct inode *ip = VTOI(vp);
 
 	if (vp->v_usecount > 1 && !(ip->i_flag & ILOCKED))
 		ITIMES(ip, &time, &time);
-	return (spec_close(vp, fflag, cred));
+	return (spec_close(vp, fflag, cred, p));
 }
 
 #ifdef FIFO
 /*
  * Read wrapper for fifo's
  */
+int
 ufsfifo_read(vp, uio, ioflag, cred)
 	struct vnode *vp;
 	struct uio *uio;
@@ -1605,6 +1463,7 @@ ufsfifo_read(vp, uio, ioflag, cred)
 /*
  * Write wrapper for fifo's.
  */
+int
 ufsfifo_write(vp, uio, ioflag, cred)
 	struct vnode *vp;
 	struct uio *uio;
@@ -1624,42 +1483,188 @@ ufsfifo_write(vp, uio, ioflag, cred)
  *
  * Update the times on the inode then do device close.
  */
-ufsfifo_close(vp, fflag, cred)
+ufsfifo_close(vp, fflag, cred, p)
 	struct vnode *vp;
 	int fflag;
 	struct ucred *cred;
+	struct proc *p;
 {
 	register struct inode *ip = VTOI(vp);
 
 	if (vp->v_usecount > 1 && !(ip->i_flag & ILOCKED))
 		ITIMES(ip, &time, &time);
-	return (fifo_close(vp, fflag, cred));
+	return (fifo_close(vp, fflag, cred, p));
 }
 #endif /* FIFO */
 
 /*
- * Make a new file.
+ * Advisory record locking support
+ */
+int
+ufs_advlock(vp, id, op, fl, flags)
+	struct vnode *vp;
+	caddr_t id;
+	int op;
+	register struct flock *fl;
+	int flags;
+{
+	register struct inode *ip = VTOI(vp);
+	register struct lockf *lock;
+	off_t start, end;
+	int error;
+
+	/*
+	 * Avoid the common case of unlocking when inode has no locks.
+	 */
+	if (ip->i_lockf == (struct lockf *)0) {
+		if (op != F_SETLK) {
+			fl->l_type = F_UNLCK;
+			return (0);
+		}
+	}
+	/*
+	 * Convert the flock structure into a start and end.
+	 */
+	switch (fl->l_whence) {
+
+	case SEEK_SET:
+	case SEEK_CUR:
+		/*
+		 * Caller is responsible for adding any necessary offset
+		 * when SEEK_CUR is used.
+		 */
+		start = fl->l_start;
+		break;
+
+	case SEEK_END:
+		start = ip->i_size + fl->l_start;
+		break;
+
+	default:
+		return (EINVAL);
+	}
+	if (start < 0)
+		return (EINVAL);
+	if (fl->l_len == 0)
+		end = -1;
+	else
+		end = start + fl->l_len - 1;
+	/*
+	 * Create the lockf structure
+	 */
+	MALLOC(lock, struct lockf *, sizeof *lock, M_LOCKF, M_WAITOK);
+	lock->lf_start = start;
+	lock->lf_end = end;
+	lock->lf_id = id;
+	lock->lf_inode = ip;
+	lock->lf_type = fl->l_type;
+	lock->lf_next = (struct lockf *)0;
+	lock->lf_block = (struct lockf *)0;
+	lock->lf_flags = flags;
+	/*
+	 * Do the requested operation.
+	 */
+	switch(op) {
+	case F_SETLK:
+		return (lf_setlock(lock));
+
+	case F_UNLCK:
+		error = lf_clearlock(lock);
+		FREE(lock, M_LOCKF);
+		return (error);
+
+	case F_GETLK:
+		error = lf_getlock(lock, fl);
+		FREE(lock, M_LOCKF);
+		return (error);
+	
+	default:
+		free(lock, M_LOCKF);
+		return (EINVAL);
+	}
+	/* NOTREACHED */
+}
+
+/*
+ * Initialize the vnode associated with a new inode, handle aliased
+ * vnodes.
+ */
+int
+ufs_vinit(mntp, vpp)
+	struct mount *mntp;
+	struct vnode **vpp;
+{
+	struct inode *ip, *nip;
+	struct vnode *vp, *nvp;
+
+	vp = *vpp;
+	ip = VTOI(vp);
+	switch(vp->v_type = IFTOVT(ip->i_mode)) {
+	case VCHR:
+	case VBLK:
+		vp->v_op = &spec_inodeops;
+		if (nvp = checkalias(vp, ip->i_rdev, mntp)) {
+			/* Reinitialize aliased inode. */
+			vp = nvp;
+			nip = VTOI(vp);
+			nip->i_vnode = vp;
+			nip->i_flag = 0;
+			nip->i_din = ip->i_din;
+			nip->i_dev = ip->i_dev;
+			nip->i_number = ip->i_number;
+			ufs_ihashins(nip);
+
+			/* Discard unneeded inode. */
+			ip->i_mode = 0;
+			ufs_iput(ip);
+
+			ip = nip;
+		}
+		break;
+	case VFIFO:
+#ifdef FIFO
+		vp->v_op = &fifo_inodeops;
+		break;
+#else
+		return (EOPNOTSUPP);
+#endif
+	}
+	VREF(ip->i_devvp);
+
+	if (ip->i_number == ROOTINO)
+                vp->v_flag |= VROOT;
+
+	*vpp = vp;
+	return (0);
+}
+
+/*
+ * Allocate a new inode.
  */
-maknode(mode, ndp, ipp)
+int
+ufs_makeinode(mode, ndp, ipp)
 	int mode;
 	register struct nameidata *ndp;
 	struct inode **ipp;
 {
-	register struct inode *ip;
+	register struct inode *ip, *pdir;
 	struct inode *tip;
-	register struct inode *pdir = VTOI(ndp->ni_dvp);
-	ino_t ipref;
+	struct ufsmount *ump;
 	int error;
 
-	*ipp = 0;
+	pdir = VTOI(ndp->ni_dvp);
+#ifdef DIANOSTIC
+	if ((ndp->ni_nameiop & HASBUF) == 0)
+		panic("ufs_makeinode: no name");
+#endif
+	*ipp = NULL;
 	if ((mode & IFMT) == 0)
 		mode |= IFREG;
-	if ((mode & IFMT) == IFDIR)
-		ipref = dirpref(pdir->i_fs);
-	else
-		ipref = pdir->i_number;
-	if (error = ialloc(pdir, ipref, mode, ndp->ni_cred, &tip)) {
-		iput(pdir);
+
+	ump = VFSTOUFS(ndp->ni_dvp->v_mount);
+	if (error = (ump->um_ialloc)(pdir, mode, ndp->ni_cred, &tip)) {
+		free(ndp->ni_pnbuf, M_NAMEI);
+		ufs_iput(pdir);
 		return (error);
 	}
 	ip = tip;
@@ -1668,9 +1673,10 @@ maknode(mode, ndp, ipp)
 #ifdef QUOTA
 	if ((error = getinoquota(ip)) ||
 	    (error = chkiq(ip, 1, ndp->ni_cred, 0))) {
-		ifree(ip, ip->i_number, mode);
-		iput(ip);
-		iput(pdir);
+		free(ndp->ni_pnbuf, M_NAMEI);
+		(ump->um_ifree)(ip, ip->i_number, mode);
+		ufs_iput(ip);
+		ufs_iput(pdir);
 		return (error);
 	}
 #endif
@@ -1685,12 +1691,13 @@ maknode(mode, ndp, ipp)
 	/*
 	 * Make sure inode goes to disk before directory entry.
 	 */
-	if (error = iupdat(ip, &time, &time, 1))
+	if (error = (ump->um_iupdat)(ip, &time, &time, 1))
 		goto bad;
-	if (error = direnter(ip, ndp)) {
-		pdir = NULL;
+	if (error = ufs_direnter(ip, ndp))
 		goto bad;
-	}
+	if ((ndp->ni_nameiop & SAVESTART) == 0)
+		FREE(ndp->ni_pnbuf, M_NAMEI);
+	ufs_iput(pdir);
 	*ipp = ip;
 	return (0);
 
@@ -1699,10 +1706,10 @@ bad:
 	 * Write error occurred trying to update the inode
 	 * or the directory so must deallocate the inode.
 	 */
-	if (pdir)
-		iput(pdir);
+	free(ndp->ni_pnbuf, M_NAMEI);
+	ufs_iput(pdir);
 	ip->i_nlink = 0;
 	ip->i_flag |= ICHG;
-	iput(ip);
+	ufs_iput(ip);
 	return (error);
 }