X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/10bae9ee1aeaee13e63c4615fa45369e4e6acb84..4c5ed28aa382bb34796c47f745f2abe32ad9bb97:/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 3ae58761b4..1f4f7422a1 100644
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,203 +4,34 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)ufs_vnops.c	7.54 (Berkeley) %G%
+ *	@(#)ufs_vnops.c	7.70 (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 "fcntl.h"
-#include "malloc.h"
-#include "../ufs/lockf.h"
-#include "../ufs/quota.h"
-#include "../ufs/inode.h"
-#include "../ufs/fs.h"
-
-/*
- * 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(),
-	ufs_advlock();
-
-struct vnodeops ufs_vnodeops = {
-	ufs_lookup,		/* lookup */
-	ufs_create,		/* create */
-	ufs_mknod,		/* mknod */
-	ufs_open,		/* open */
-	ufs_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 */
-	ufs_inactive,		/* inactive */
-	ufs_reclaim,		/* reclaim */
-	ufs_lock,		/* lock */
-	ufs_unlock,		/* unlock */
-	ufs_bmap,		/* bmap */
-	ufs_strategy,		/* strategy */
-	ufs_print,		/* print */
-	ufs_islocked,		/* islocked */
-	ufs_advlock,		/* advlock */
-};
-
-int	spec_lookup(),
-	spec_open(),
-	ufsspec_read(),
-	ufsspec_write(),
-	spec_strategy(),
-	spec_bmap(),
-	spec_ioctl(),
-	spec_select(),
-	ufsspec_close(),
-	spec_advlock(),
-	spec_badop(),
-	spec_nullop();
-
-struct vnodeops spec_inodeops = {
-	spec_lookup,		/* lookup */
-	spec_badop,		/* create */
-	spec_badop,		/* mknod */
-	spec_open,		/* open */
-	ufsspec_close,		/* close */
-	ufs_access,		/* access */
-	ufs_getattr,		/* getattr */
-	ufs_setattr,		/* setattr */
-	ufsspec_read,		/* read */
-	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 */
-	ufs_inactive,		/* inactive */
-	ufs_reclaim,		/* reclaim */
-	ufs_lock,		/* lock */
-	ufs_unlock,		/* unlock */
-	spec_bmap,		/* bmap */
-	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_advlock(),
-	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 */
-	fifo_advlock,		/* advlock */
-};
-#endif /* FIFO */
+#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 *));
 
 enum vtype iftovt_tab[16] = {
 	VNON, VFIFO, VCHR, VNON, VDIR, VNON, VBLK, VNON,
@@ -213,16 +44,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 inode *ip;
+	struct vnode *vp;
 	int error;
 
-	if (error = maknode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &ip))
+	if (error =
+	    ufs_makeinode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &vp))
 		return (error);
-	ndp->ni_vp = ITOV(ip);
+	ndp->ni_vp = vp;
 	return (0);
 }
 
@@ -230,17 +64,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;
+	register struct inode *ip;
+	struct vnode *vp;
 	int error;
 
-	if (error = maknode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &ip))
+	if (error =
+	    ufs_makeinode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &vp))
 		return (error);
+	ip = VTOI(vp);
 	ip->i_flag |= IACC|IUPD|ICHG;
 	if (vap->va_rdev != VNOVAL) {
 		/*
@@ -254,7 +92,6 @@ ufs_mknod(ndp, vap, cred)
 	 * checked to see if it is an alias of an existing entry
 	 * in the inode cache.
 	 */
-	vp = ITOV(ip);
 	vput(vp);
 	vp->v_type = VNON;
 	vgone(vp);
@@ -267,10 +104,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);
@@ -282,13 +121,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);
@@ -299,10 +141,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;
@@ -349,13 +193,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
@@ -387,7 +234,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_iosize;
 	vap->va_bytes = dbtob(ip->i_blocks);
 	vap->va_bytes_rsv = 0;
 	vap->va_type = vp->v_type;
@@ -397,16 +244,18 @@ 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;
+	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) ||
@@ -418,31 +267,33 @@ 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);
 	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 = VOP_TRUNCATE(vp, vap->va_size, 0)) /* IO_SYNC? */
 			return (error);
 	}
+	ip = VTOI(vp);
 	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 = VOP_UPDATE(vp, &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;
@@ -459,16 +310,18 @@ ufs_setattr(vp, vap, cred)
  * Change the mode on a file.
  * Inode must be locked before calling.
  */
-chmod1(vp, mode, cred)
+static 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);
 	if (cred->cr_uid) {
 		if (vp->v_type != VDIR && (mode & ISVTX))
@@ -488,13 +341,15 @@ chmod1(vp, mode, cred)
  * Perform chown operation on inode ip;
  * inode must be locked prior to call.
  */
-chown1(vp, uid, gid, cred)
+static 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;
@@ -514,7 +369,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;
@@ -589,180 +444,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 n, on, flags;
-	int 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;
-			vnode_pager_setsize(vp, ip->i_size);
-		}
-		size = blksize(fs, ip, lbn);
-		(void) vnode_pager_uncache(vp);
-		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);
 }
 
 /*
@@ -771,39 +479,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;
@@ -818,15 +511,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;
@@ -834,32 +529,43 @@ 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;
 	int error;
 
-	if ((unsigned short)ip->i_nlink >= LINK_MAX)
+#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);
 	ip->i_nlink++;
 	ip->i_flag |= ICHG;
-	error = iupdat(ip, &time, &time, 1);
+	error = VOP_UPDATE(vp, &time, &time, 1);
 	if (!error)
-		error = direnter(ip, ndp);
+		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;
@@ -891,25 +597,46 @@ ufs_link(vp, ndp)
  *    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;
 	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)
@@ -933,7 +660,7 @@ ufs_rename(fndp, tndp)
 	 */
 	ip->i_nlink++;
 	ip->i_flag |= ICHG;
-	error = iupdat(ip, &time, &time, 1);
+	error = VOP_UPDATE(fndp->ni_vp, &time, &time, 1);
 	IUNLOCK(ip);
 
 	/*
@@ -958,24 +685,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 &= ~(MODMASK | OPMASK);
-		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
@@ -999,11 +725,18 @@ ufs_rename(fndp, tndp)
 			}
 			dp->i_nlink++;
 			dp->i_flag |= ICHG;
-			if (error = iupdat(dp, &time, &time, 1))
+			if (error = VOP_UPDATE(ITOV(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)VOP_UPDATE(ITOV(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");
@@ -1025,14 +758,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;
@@ -1046,7 +777,7 @@ 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
@@ -1058,7 +789,7 @@ ufs_rename(fndp, tndp)
 			dp->i_nlink--;
 			dp->i_flag |= ICHG;
 		}
-		vput(ITOV(dp));
+		ufs_iput(dp);
 		/*
 		 * Adjust the link count of the target to
 		 * reflect the dirrewrite above.  If this is
@@ -1073,19 +804,23 @@ ufs_rename(fndp, tndp)
 		if (doingdirectory) {
 			if (--xp->i_nlink != 0)
 				panic("rename: linked directory");
-			error = itrunc(xp, (u_long)0, IO_SYNC);
+			error = VOP_TRUNCATE(ITOV(xp), (u_long)0, IO_SYNC);
 		}
 		xp->i_flag |= ICHG;
-		iput(xp);
+		ufs_iput(xp);
 		xp = NULL;
 	}
 
 	/*
 	 * 3) Unlink the source.
 	 */
-	fndp->ni_nameiop &= ~(MODMASK | OPMASK);
-	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);
@@ -1124,12 +859,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),
@@ -1137,12 +873,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;
@@ -1170,7 +907,7 @@ out:
 /*
  * A virgin directory (no blushing please).
  */
-struct dirtemplate mastertemplate = {
+static struct dirtemplate mastertemplate = {
 	0, 12, 1, ".",
 	0, DIRBLKSIZ - 12, 2, ".."
 };
@@ -1178,45 +915,52 @@ 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 vnode *tvp;
 	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) {
-		iput(dp);
+		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);
+	if (error = VOP_VALLOC(dvp, dmode, ndp->ni_cred, &tvp)) {
+		free(ndp->ni_pnbuf, M_NAMEI);
+		ufs_iput(dp);
 		return (error);
 	}
-	ip = tip;
+	ip = VTOI(tvp);
 	ip->i_uid = ndp->ni_cred->cr_uid;
 	ip->i_gid = dp->i_gid;
 #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);
+		VOP_VFREE(tvp, ip->i_number, dmode);
+		ufs_iput(ip);
+		ufs_iput(dp);
 		return (error);
 	}
 #endif
@@ -1224,7 +968,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 = VOP_UPDATE(ITOV(ip), &time, &time, 1);
 
 	/*
 	 * Bump link count in parent directory
@@ -1234,71 +978,59 @@ ufs_mkdir(ndp, vap)
 	 */
 	dp->i_nlink++;
 	dp->i_flag |= ICHG;
-	error = iupdat(dp, &time, &time, 1);
+	if (error = VOP_UPDATE(ITOV(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 > VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_bsize)
+		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 &= ~(MODMASK | OPMASK);
-		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 VOP_TRUNCATE 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;
+	int error;
 
 	ip = VTOI(ndp->ni_vp);
 	dp = VTOI(ndp->ni_dvp);
@@ -1306,8 +1038,8 @@ ufs_rmdir(ndp)
 	 * No rmdir "." please.
 	 */
 	if (dp == ip) {
-		vrele(ITOV(dp));
-		iput(ip);
+		vrele(ndp->ni_dvp);
+		ufs_iput(ip);
 		return (EINVAL);
 	}
 	/*
@@ -1317,7 +1049,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;
 	}
@@ -1326,12 +1060,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);
+	cache_purge(ndp->ni_dvp);
+	ufs_iput(dp);
 	ndp->ni_dvp = NULL;
 	/*
 	 * Truncate inode.  The only stuff left
@@ -1345,38 +1079,41 @@ ufs_rmdir(ndp)
 	 * worry about them later.
 	 */
 	ip->i_nlink -= 2;
-	error = itrunc(ip, (u_long)0, IO_SYNC);
+	error = VOP_TRUNCATE(ndp->ni_vp, (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 vnode *vp;
 	int error;
 
-	error = maknode(IFLNK | vap->va_mode, ndp, &ip);
-	if (error)
+	if (error = ufs_makeinode(IFLNK | vap->va_mode, ndp, &vp))
 		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);
+	error = vn_rdwr(UIO_WRITE, vp, target, strlen(target), (off_t)0,
+		UIO_SYSSPACE, IO_NODELOCKED, ndp->ni_cred, (int *)0,
+		(struct proc *)0);
+	vput(vp);
 	return (error);
 }
 
 /*
  * Vnode op for read and write
  */
+int
 ufs_readdir(vp, uio, cred, eofflagp)
 	struct vnode *vp;
 	register struct uio *uio;
@@ -1392,7 +1129,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;
@@ -1404,30 +1141,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;
 {
@@ -1440,6 +1182,7 @@ ufs_lock(vp)
 /*
  * Unlock an inode.
  */
+int
 ufs_unlock(vp)
 	struct vnode *vp;
 {
@@ -1454,6 +1197,7 @@ ufs_unlock(vp)
 /*
  * Check for a locked inode.
  */
+int
 ufs_islocked(vp)
 	struct vnode *vp;
 {
@@ -1463,41 +1207,26 @@ ufs_islocked(vp)
 	return (0);
 }
 
-/*
- * Get access to bmap
- */
-ufs_bmap(vp, bn, vpp, bnp)
-	struct vnode *vp;
-	daddr_t bn;
-	struct vnode **vpp;
-	daddr_t *bnp;
-{
-	struct inode *ip = VTOI(vp);
-
-	if (vpp != NULL)
-		*vpp = ip->i_devvp;
-	if (bnp == NULL)
-		return (0);
-	return (bmap(ip, bn, bnp));
-}
-
 /*
  * Calculate the logical to physical mapping if not done already,
  * then call the device strategy routine.
  */
 int checkoverlap = 0;
 
+int
 ufs_strategy(bp)
 	register struct buf *bp;
 {
-	register struct inode *ip = VTOI(bp->b_vp);
+	register struct inode *ip;
 	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))
+		if (error =
+		    VOP_BMAP(bp->b_vp, bp->b_lblkno, NULL, &bp->b_blkno))
 			return (error);
 		if ((long)bp->b_blkno == -1)
 			clrbuf(bp);
@@ -1507,43 +1236,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;
 {
@@ -1556,17 +1262,19 @@ ufs_print(vp)
 		fifo_printinfo(vp);
 #endif /* FIFO */
 	printf("%s\n", (ip->i_flag & ILOCKED) ? " (LOCKED)" : "");
-	if (ip->i_spare0 == 0)
-		return;
-	printf("\towner pid %d", ip->i_spare0);
-	if (ip->i_spare1)
-		printf(" waiting pid %d", ip->i_spare1);
+	if (ip->i_lockholder == 0)
+		return (0);
+	printf("\towner pid %d", ip->i_lockholder);
+	if (ip->i_lockwaiter)
+		printf(" waiting pid %d", ip->i_lockwaiter);
 	printf("\n");
+	return (0);
 }
 
 /*
  * Read wrapper for special devices.
  */
+int
 ufsspec_read(vp, uio, ioflag, cred)
 	struct vnode *vp;
 	struct uio *uio;
@@ -1584,6 +1292,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;
@@ -1603,22 +1312,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;
@@ -1636,6 +1348,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;
@@ -1655,92 +1368,24 @@ 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.
- */
-maknode(mode, ndp, ipp)
-	int mode;
-	register struct nameidata *ndp;
-	struct inode **ipp;
-{
-	register struct inode *ip;
-	struct inode *tip;
-	register struct inode *pdir = VTOI(ndp->ni_dvp);
-	ino_t ipref;
-	int error;
-
-	*ipp = 0;
-	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);
-		return (error);
-	}
-	ip = tip;
-	ip->i_uid = ndp->ni_cred->cr_uid;
-	ip->i_gid = pdir->i_gid;
-#ifdef QUOTA
-	if ((error = getinoquota(ip)) ||
-	    (error = chkiq(ip, 1, ndp->ni_cred, 0))) {
-		ifree(ip, ip->i_number, mode);
-		iput(ip);
-		iput(pdir);
-		return (error);
-	}
-#endif
-	ip->i_flag |= IACC|IUPD|ICHG;
-	ip->i_mode = mode;
-	ITOV(ip)->v_type = IFTOVT(mode);	/* Rest init'd in iget() */
-	ip->i_nlink = 1;
-	if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, ndp->ni_cred) &&
-	    suser(ndp->ni_cred, NULL))
-		ip->i_mode &= ~ISGID;
-
-	/*
-	 * Make sure inode goes to disk before directory entry.
-	 */
-	if (error = iupdat(ip, &time, &time, 1))
-		goto bad;
-	if (error = direnter(ip, ndp)) {
-		pdir = NULL;
-		goto bad;
-	}
-	*ipp = ip;
-	return (0);
-
-bad:
-	/*
-	 * Write error occurred trying to update the inode
-	 * or the directory so must deallocate the inode.
-	 */
-	if (pdir)
-		iput(pdir);
-	ip->i_nlink = 0;
-	ip->i_flag |= ICHG;
-	iput(ip);
-	return (error);
-}
-
 /*
  * Advisory record locking support
  */
+int
 ufs_advlock(vp, id, op, fl, flags)
 	struct vnode *vp;
 	caddr_t id;
@@ -1806,13 +1451,17 @@ ufs_advlock(vp, id, op, fl, flags)
 	 */
 	switch(op) {
 	case F_SETLK:
-		return (ufs_setlock(lock));
+		return (lf_setlock(lock));
 
 	case F_UNLCK:
-		return (ufs_advunlock(lock));
+		error = lf_clearlock(lock);
+		FREE(lock, M_LOCKF);
+		return (error);
 
 	case F_GETLK:
-		return (ufs_advgetlock(lock, fl));
+		error = lf_getlock(lock, fl);
+		FREE(lock, M_LOCKF);
+		return (error);
 	
 	default:
 		free(lock, M_LOCKF);
@@ -1822,166 +1471,128 @@ ufs_advlock(vp, id, op, fl, flags)
 }
 
 /*
- * This variable controls the maximum number of processes that will
- * be checked in doing deadlock detection.
- */
-int maxlockdepth = MAXDEPTH;
-
-/*
- * Set a byte-range lock.
+ * Initialize the vnode associated with a new inode, handle aliased
+ * vnodes.
  */
-ufs_setlock(lock)
-	register struct lockf *lock;
+int
+ufs_vinit(mntp, specops, fifoops, vpp)
+	struct mount *mntp;
+	struct vnodeops *specops, *fifoops;
+	struct vnode **vpp;
 {
-	register struct inode *ip = lock->lf_inode;
-	register struct lockf *block;
-	static char lockstr[] = "lockf";
-	int priority, error;
-
-#ifdef LOCKF_DEBUG
-	if (lockf_debug & 4)
-		lf_print("ufs_setlock", lock);
-#endif /* LOCKF_DEBUG */
-
-	/*
-	 * Set the priority
-	 */
-	priority = PLOCK;
-	if ((lock->lf_type & F_WRLCK) == 0)
-		priority += 4;
-	priority |= PCATCH;
-	/*
-	 * Scan lock list for this file looking for locks that would block us.
-	 */
-	while (block = lf_getblock(lock)) {
-		/*
-		 * Free the structure and return if nonblocking.
-		 */
-		if ((lock->lf_flags & F_WAIT) == 0) {
-			free(lock, M_LOCKF);
-			return (EAGAIN);
+	struct inode *ip, *nip;
+	struct vnode *vp, *nvp;
+	extern struct vnodeops spec_vnodeops;
+
+	vp = *vpp;
+	ip = VTOI(vp);
+	switch(vp->v_type = IFTOVT(ip->i_mode)) {
+	case VCHR:
+	case VBLK:
+		vp->v_op = specops;
+		if (nvp = checkalias(vp, ip->i_rdev, mntp)) {
+			/*
+			 * Discard unneeded vnode, but save its inode.
+			 */
+			remque(ip);
+			IUNLOCK(ip);
+			nvp->v_data = vp->v_data;
+			vp->v_data = NULL;
+			vp->v_op = &spec_vnodeops;
+			vrele(vp);
+			vgone(vp);
+			/*
+			 * Reinitialize aliased inode.
+			 */
+			vp = nvp;
+			ip->i_vnode = vp;
+			ufs_ihashins(ip);
 		}
-		/*
-		 * We are blocked. Since flock style locks cover
-		 * the whole file, there is no chance for deadlock.
-		 * For byte-range locks we must check for deadlock.
-		 *
-		 * Deadlock detection is done by looking through the
-		 * wait channels to see if there are any cycles that
-		 * involve us. MAXDEPTH is set just to make sure we
-		 * do not go off into neverland.
-		 */
-		if ((lock->lf_flags & F_POSIX) &&
-		    (block->lf_flags & F_POSIX)) {
-			register struct proc *wproc;
-			register struct lockf *waitblock;
-			int i = 0;
-
-			/* The block is waiting on something */
-			wproc = (struct proc *)block->lf_id;
-			while (wproc->p_wchan &&
-			       (wproc->p_wmesg == lockstr) &&
-			       (i++ < maxlockdepth)) {
-				waitblock = (struct lockf *)wproc->p_wchan;
-				/* Get the owner of the blocking lock */
-				waitblock = waitblock->lf_next;
-				if ((waitblock->lf_flags & F_POSIX) == 0)
-					break;
-				wproc = (struct proc *)waitblock->lf_id;
-				if (wproc == (struct proc *)lock->lf_id) {
-					free(lock, M_LOCKF);
-					return (EDEADLK);
-				}
-			}
-		}
-		/*
-		 * Add our lock to the blocked
-		 * list and sleep until we're free.
-		 */
-#ifdef LOCKF_DEBUG
-		if (lockf_debug & 4)
-			lf_print("ufs_advlock: blocking on", block);
-#endif /* LOCKF_DEBUG */
-		/*
-		 * Remember who blocked us (for deadlock detection)
-		 */
-		lock->lf_next = block;
-		lf_addblock(block, lock);
-		if (error = tsleep((caddr_t *)lock, priority, lockstr, 0)) {
-			free(lock, M_LOCKF);
-			return (error);
-		}
-	}
-	/*
-	 * No blocks!!  Add the lock.  Note that addlock will
-	 * downgrade or upgrade any overlapping locks this
-	 * process already owns.
-	 */
-	lf_addlock(lock);
-#ifdef LOCKF_DEBUG
-	if (lockf_debug & 4) {
-		lf_print("ufs_advlock: got the lock", lock);
-		lf_printlist(lock);
+		break;
+	case VFIFO:
+#ifdef FIFO
+		vp->v_op = fifoops;
+		break;
+#else
+		return (EOPNOTSUPP);
+#endif
 	}
-#endif /* LOCKF_DEBUG */
+	if (ip->i_number == ROOTINO)
+                vp->v_flag |= VROOT;
+	*vpp = vp;
 	return (0);
 }
 
 /*
- * Remove a byte-range lock on an inode.
+ * Allocate a new inode.
  */
-ufs_advunlock(lock)
-	struct lockf *lock;
+int
+ufs_makeinode(mode, ndp, vpp)
+	int mode;
+	register struct nameidata *ndp;
+	struct vnode **vpp;
 {
-	struct lockf *blocklist;
+	register struct inode *ip, *pdir;
+	struct vnode *tvp;
+	int error;
+
+	pdir = VTOI(ndp->ni_dvp);
+#ifdef DIANOSTIC
+	if ((ndp->ni_nameiop & HASBUF) == 0)
+		panic("ufs_makeinode: no name");
+#endif
+	*vpp = NULL;
+	if ((mode & IFMT) == 0)
+		mode |= IFREG;
+
+	if (error = VOP_VALLOC(ndp->ni_dvp, mode, ndp->ni_cred, &tvp)) {
+		free(ndp->ni_pnbuf, M_NAMEI);
+		ufs_iput(pdir);
+		return (error);
+	}
+	ip = VTOI(tvp);
+	ip->i_uid = ndp->ni_cred->cr_uid;
+	ip->i_gid = pdir->i_gid;
+#ifdef QUOTA
+	if ((error = getinoquota(ip)) ||
+	    (error = chkiq(ip, 1, ndp->ni_cred, 0))) {
+		free(ndp->ni_pnbuf, M_NAMEI);
+		VOP_VFREE(tvp, ip->i_number, mode);
+		ufs_iput(ip);
+		ufs_iput(pdir);
+		return (error);
+	}
+#endif
+	ip->i_flag |= IACC|IUPD|ICHG;
+	ip->i_mode = mode;
+	tvp->v_type = IFTOVT(mode);	/* Rest init'd in iget() */
+	ip->i_nlink = 1;
+	if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, ndp->ni_cred) &&
+	    suser(ndp->ni_cred, NULL))
+		ip->i_mode &= ~ISGID;
 
-	if (lock->lf_inode->i_lockf == (struct lockf *)0)
-		return (0);
-#ifdef LOCKF_DEBUG
-	if (lockf_debug & 4)
-		lf_print("ufs_advunlock", lock);
-#endif /* LOCKF_DEBUG */
 	/*
-	 * Generally, find the lock (or an overlap to that lock)
-	 * and remove it (or shrink it), then wakeup anyone we can.
+	 * Make sure inode goes to disk before directory entry.
 	 */
-	blocklist = lf_remove(lock);
-#ifdef LOCKF_DEBUG
-	lf_printlist(lock);
-#endif /* LOCKF_DEBUG */
-	FREE(lock, M_LOCKF);
-	lf_wakelock(blocklist);
+	if (error = VOP_UPDATE(tvp, &time, &time, 1))
+		goto bad;
+	if (error = ufs_direnter(ip, ndp))
+		goto bad;
+	if ((ndp->ni_nameiop & SAVESTART) == 0)
+		FREE(ndp->ni_pnbuf, M_NAMEI);
+	ufs_iput(pdir);
+	*vpp = tvp;
 	return (0);
-}
 
-/*
- * Return the blocking pid
- */
-ufs_advgetlock(lock, fl)
-	register struct lockf *lock;
-	register struct flock *fl;
-{
-	register struct lockf *block;
-	off_t start, end;
-
-#ifdef LOCKF_DEBUG
-	if (lockf_debug & 4)
-		lf_print("ufs_advgetlock", lock);
-#endif /* LOCKF_DEBUG */
-
-	if (block = lf_getblock(lock)) {
-		fl->l_type = block->lf_type;
-		fl->l_whence = SEEK_SET;
-		fl->l_start = block->lf_start;
-		if (block->lf_end == -1)
-			fl->l_len = 0;
-		else
-			fl->l_len = block->lf_end - block->lf_start + 1;
-		if (block->lf_flags & F_POSIX)
-			fl->l_pid = ((struct proc *)(block->lf_id))->p_pid;
-		else
-			fl->l_pid = -1;
-	}
-	FREE(lock, M_LOCKF);
-	return (0);
+bad:
+	/*
+	 * Write error occurred trying to update the inode
+	 * or the directory so must deallocate the inode.
+	 */
+	free(ndp->ni_pnbuf, M_NAMEI);
+	ufs_iput(pdir);
+	ip->i_nlink = 0;
+	ip->i_flag |= ICHG;
+	ufs_iput(ip);
+	return (error);
 }