X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/02c45551ed6e685f527b4a0b5f3031fe1c279d5b..ca3e8b68101f977f8bbece63aeee278dc03caca3:/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 82c94d9fae..859110db8f 100644
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -1,759 +1,576 @@
-/*	ufs_vnops.c	4.59	83/05/31	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/file.h"
-#include "../h/stat.h"
-#include "../h/inode.h"
-#include "../h/fs.h"
-#include "../h/buf.h"
-#include "../h/proc.h"
-#include "../h/quota.h"
-#include "../h/uio.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/nami.h"
-#include "../h/mount.h"
-
-extern	struct fileops inodeops;
-struct	file *getinode();
-
 /*
- * Change current working directory (``.'').
+ * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *	@(#)ufs_vnops.c	7.68 (Berkeley) %G%
  */
-chdir()
-{
 
-	chdirec(&u.u_cdir);
-}
+#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,
+	VREG, VNON, VLNK, VNON, VSOCK, VNON, VNON, VBAD,
+};
+int	vttoif_tab[9] = {
+	0, IFREG, IFDIR, IFBLK, IFCHR, IFLNK, IFSOCK, IFIFO, IFMT,
+};
 
 /*
- * Change notion of root (``/'') directory.
+ * Create a regular file
  */
-chroot()
+int
+ufs_create(ndp, vap, p)
+	struct nameidata *ndp;
+	struct vattr *vap;
+	struct proc *p;
 {
+	struct vnode *vp;
+	int error;
 
-	if (suser())
-		chdirec(&u.u_rdir);
+	if (error =
+	    ufs_makeinode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &vp))
+		return (error);
+	ndp->ni_vp = vp;
+	return (0);
 }
 
 /*
- * Common routine for chroot and chdir.
+ * Mknod vnode call
  */
-chdirec(ipp)
-	register struct inode **ipp;
+/* ARGSUSED */
+int
+ufs_mknod(ndp, vap, cred, p)
+	struct nameidata *ndp;
+	struct vattr *vap;
+	struct ucred *cred;
+	struct proc *p;
 {
 	register struct inode *ip;
-	struct a {
-		char	*fname;
-	};
-
-	ip = namei(uchar, LOOKUP, 1);
-	if (ip == NULL)
-		return;
-	if ((ip->i_mode&IFMT) != IFDIR) {
-		u.u_error = ENOTDIR;
-		goto bad;
-	}
-	if (access(ip, IEXEC))
-		goto bad;
-	iunlock(ip);
-	if (*ipp)
-		irele(*ipp);
-	*ipp = ip;
-	return;
+	struct vnode *vp;
+	int error;
 
-bad:
-	iput(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) {
+		/*
+		 * Want to be able to use this to make badblock
+		 * inodes, so don't truncate the dev number.
+		 */
+		ip->i_rdev = vap->va_rdev;
+	}
+	/*
+	 * Remove inode so that it will be reloaded by iget and
+	 * checked to see if it is an alias of an existing entry
+	 * in the inode cache.
+	 */
+	vput(vp);
+	vp->v_type = VNON;
+	vgone(vp);
+	return (0);
 }
 
 /*
- * Open system call.
+ * Open called.
+ *
+ * Nothing to do.
  */
-open()
+/* ARGSUSED */
+int
+ufs_open(vp, mode, cred, p)
+	struct vnode *vp;
+	int mode;
+	struct ucred *cred;
+	struct proc *p;
 {
-	struct a {
-		char	*fname;
-		int	mode;
-		int	crtmode;
-	} *uap = (struct a *) u.u_ap;
 
-	copen(uap->mode-FOPEN, uap->crtmode);
+	return (0);
 }
 
 /*
- * Creat system call.
+ * Close called
+ *
+ * Update the times on the inode.
  */
-creat()
+/* ARGSUSED */
+int
+ufs_close(vp, fflag, cred, p)
+	struct vnode *vp;
+	int fflag;
+	struct ucred *cred;
+	struct proc *p;
 {
-	struct a {
-		char	*fname;
-		int	fmode;
-	} *uap = (struct a *)u.u_ap;
+	register struct inode *ip;
 
-	copen(FWRITE|FCREAT|FTRUNC, uap->fmode);
+	ip = VTOI(vp);
+	if (vp->v_usecount > 1 && !(ip->i_flag & ILOCKED))
+		ITIMES(ip, &time, &time);
+	return (0);
 }
 
 /*
- * Common code for open and creat.
- * Check permissions, allocate an open file structure,
- * and call the device open routine if any.
+ * Check mode permission on inode pointer. Mode is READ, WRITE or EXEC.
+ * The mode is shifted to select the owner/group/other fields. The
+ * super user is granted all permissions.
  */
-copen(mode, arg)
+int
+ufs_access(vp, mode, cred, p)
+	struct vnode *vp;
 	register int mode;
-	int arg;
+	struct ucred *cred;
+	struct proc *p;
 {
-	register struct inode *ip;
-	register struct file *fp;
-	int i;
-
-#ifdef notdef
-	if ((mode&(FREAD|FWRITE)) == 0) {
-		u.u_error = EINVAL;
-		return;
+	register struct inode *ip = VTOI(vp);
+	register gid_t *gp;
+	int i, error;
+
+#ifdef DIAGNOSTIC
+	if (!VOP_ISLOCKED(vp)) {
+		vprint("ufs_access: not locked", vp);
+		panic("ufs_access: not locked");
 	}
 #endif
-	if (mode&FCREAT) {
-		ip = namei(uchar, CREATE, 1);
-		if (ip == NULL) {
-			if (u.u_error)
-				return;
-			ip = maknode(arg&07777&(~ISVTX));
-			if (ip == NULL)
-				return;
-			mode &= ~FTRUNC;
-		} else {
-			if (mode&FEXCL) {
-				u.u_error = EEXIST;
-				iput(ip);
-				return;
-			}
-			mode &= ~FCREAT;
-		}
-	} else {
-		ip = namei(uchar, LOOKUP, 1);
-		if (ip == NULL)
-			return;
-	}
-	if ((ip->i_mode & IFMT) == IFSOCK) {
-		u.u_error = EOPNOTSUPP;
-		goto bad;
-	}
-	if ((mode&FCREAT) == 0) {
-		if (mode&FREAD)
-			if (access(ip, IREAD))
-				goto bad;
-		if (mode&FWRITE) {
-			if (access(ip, IWRITE))
-				goto bad;
-			if ((ip->i_mode&IFMT) == IFDIR) {
-				u.u_error = EISDIR;
-				goto bad;
-			}
+#ifdef QUOTA
+	if (mode & VWRITE) {
+		switch (vp->v_type) {
+		case VREG: case VDIR: case VLNK:
+			if (error = getinoquota(ip))
+				return (error);
 		}
 	}
-	fp = falloc();
-	if (fp == NULL)
-		goto bad;
-	if (mode&FTRUNC)
-		itrunc(ip, (u_long)0);
-	iunlock(ip);
-	fp->f_flag = mode&FMASK;
-	fp->f_type = DTYPE_INODE;
-	fp->f_ops = &inodeops;
-	fp->f_data = (caddr_t)ip;
-	i = u.u_r.r_val1;
-#ifdef notdef
-	if (setjmp(&u.u_qsave)) {
-		if (u.u_error == 0)
-			u.u_error = EINTR;
-		u.u_ofile[i] = NULL;
-		closef(fp);
-		return;
+#endif /* QUOTA */
+	/*
+	 * If you're the super-user, you always get access.
+	 */
+	if (cred->cr_uid == 0)
+		return (0);
+	/*
+	 * Access check is based on only one of owner, group, public.
+	 * If not owner, then check group. If not a member of the
+	 * group, then check public access.
+	 */
+	if (cred->cr_uid != ip->i_uid) {
+		mode >>= 3;
+		gp = cred->cr_groups;
+		for (i = 0; i < cred->cr_ngroups; i++, gp++)
+			if (ip->i_gid == *gp)
+				goto found;
+		mode >>= 3;
+found:
+		;
 	}
-#endif
-	u.u_error = openi(ip, mode);
-	if (u.u_error == 0)
-		return;
-	u.u_ofile[i] = NULL;
-	fp->f_count--;
-	irele(ip);
-	return;
-bad:
-	iput(ip);
+	if ((ip->i_mode & mode) != 0)
+		return (0);
+	return (EACCES);
 }
 
-/*
- * Mknod system call
- */
-mknod()
+/* ARGSUSED */
+int
+ufs_getattr(vp, vap, cred, p)
+	struct vnode *vp;
+	register struct vattr *vap;
+	struct ucred *cred;
+	struct proc *p;
 {
 	register struct inode *ip;
-	register struct a {
-		char	*fname;
-		int	fmode;
-		int	dev;
-	} *uap;
-
-	uap = (struct a *)u.u_ap;
-	if (!suser())
-		return;
-	ip = namei(uchar, CREATE, 0);
-	if (ip != NULL) {
-		u.u_error = EEXIST;
-		goto out;
-	}
-	if (u.u_error)
-		return;
-	ip = maknode(uap->fmode);
-	if (ip == NULL)
-		return;
-	switch (ip->i_mode & IFMT) {
-
-	case IFCHR:
-	case IFBLK:
-		if (uap->dev) {
-			/*
-			 * Want to be able to use this to make badblock
-			 * inodes, so don't truncate the dev number.
-			 */
-			ip->i_rdev = uap->dev;
-			ip->i_flag |= IACC|IUPD|ICHG;
-		}
-	}
 
-out:
-	iput(ip);
-}
-
-/*
- * link system call
- */
-link()
-{
-	register struct inode *ip, *xp;
-	register struct a {
-		char	*target;
-		char	*linkname;
-	} *uap;
-
-	uap = (struct a *)u.u_ap;
-	ip = namei(uchar, LOOKUP, 1); /* well, this routine is doomed anyhow */
-	if (ip == NULL)
-		return;
-	if ((ip->i_mode&IFMT) == IFDIR && !suser()) {
-		iput(ip);
-		return;
-	}
-	ip->i_nlink++;
-	ip->i_flag |= ICHG;
-	iupdat(ip, &time, &time, 1);
-	iunlock(ip);
-	u.u_dirp = (caddr_t)uap->linkname;
-	xp = namei(uchar, CREATE, 0);
-	if (xp != NULL) {
-		u.u_error = EEXIST;
-		iput(xp);
-		goto out;
-	}
-	if (u.u_error)
-		goto out;
-	if (u.u_pdir->i_dev != ip->i_dev) {
-		iput(u.u_pdir);
-		u.u_error = EXDEV;
-		goto out;
-	}
-	u.u_error = direnter(ip);
-out:
-	if (u.u_error) {
-		ip->i_nlink--;
-		ip->i_flag |= ICHG;
-	}
-	irele(ip);
+	ip = VTOI(vp);
+	ITIMES(ip, &time, &time);
+	/*
+	 * Copy from inode table
+	 */
+	vap->va_fsid = ip->i_dev;
+	vap->va_fileid = ip->i_number;
+	vap->va_mode = ip->i_mode & ~IFMT;
+	vap->va_nlink = ip->i_nlink;
+	vap->va_uid = ip->i_uid;
+	vap->va_gid = ip->i_gid;
+	vap->va_rdev = (dev_t)ip->i_rdev;
+#ifdef tahoe
+	vap->va_size = ip->i_size;
+	vap->va_size_rsv = 0;
+#else
+	vap->va_qsize = ip->i_din.di_qsize;
+#endif
+	vap->va_atime.tv_sec = ip->i_atime;
+	vap->va_atime.tv_usec = 0;
+	vap->va_mtime.tv_sec = ip->i_mtime;
+	vap->va_mtime.tv_usec = 0;
+	vap->va_ctime.tv_sec = ip->i_ctime;
+	vap->va_ctime.tv_usec = 0;
+	vap->va_flags = ip->i_flags;
+	vap->va_gen = ip->i_gen;
+	/* this doesn't belong here */
+	if (vp->v_type == VBLK)
+		vap->va_blocksize = BLKDEV_IOSIZE;
+	else if (vp->v_type == VCHR)
+		vap->va_blocksize = MAXBSIZE;
+	else
+		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;
+	return (0);
 }
 
 /*
- * symlink -- make a symbolic link
+ * Set attribute vnode op. called from several syscalls
  */
-symlink()
+int
+ufs_setattr(vp, vap, cred, p)
+	register struct vnode *vp;
+	register struct vattr *vap;
+	register struct ucred *cred;
+	struct proc *p;
 {
-	register struct a {
-		char	*target;
-		char	*linkname;
-	} *uap;
 	register struct inode *ip;
-	register char *tp;
-	register c, nc;
-
-	uap = (struct a *)u.u_ap;
-	tp = uap->target;
-	nc = 0;
-	while (c = fubyte(tp)) {
-		if (c < 0) {
-			u.u_error = EFAULT;
-			return;
-		}
-		tp++;
-		nc++;
-	}
-	u.u_dirp = uap->linkname;
-	ip = namei(uchar, CREATE, 0);
-	if (ip) {
-		iput(ip);
-		u.u_error = EEXIST;
-		return;
-	}
-	if (u.u_error)
-		return;
-	ip = maknode(IFLNK | 0777);
-	if (ip == NULL)
-		return;
-	u.u_error = rdwri(UIO_WRITE, ip, uap->target, nc, 0, 0, (int *)0);
-	/* handle u.u_error != 0 */
-	iput(ip);
-}
+	int error;
 
-/*
- * Unlink system call.
- * Hard to avoid races here, especially
- * in unlinking directories.
- */
-unlink()
-{
-	struct a {
-		char	*fname;
-	};
-	register struct inode *ip, *dp;
-
-	ip = namei(uchar, DELETE | LOCKPARENT, 0);
-	if (ip == NULL)
-		return;
-	dp = u.u_pdir;
-	if ((ip->i_mode&IFMT) == IFDIR && !suser())
-		goto out;
 	/*
-	 * Don't unlink a mounted file.
+	 * Check for unsettable attributes.
 	 */
-	if (ip->i_dev != dp->i_dev) {
-		u.u_error = EBUSY;
-		goto out;
+	if ((vap->va_type != VNON) || (vap->va_nlink != VNOVAL) ||
+	    (vap->va_fsid != VNOVAL) || (vap->va_fileid != VNOVAL) ||
+	    (vap->va_blocksize != VNOVAL) || (vap->va_rdev != VNOVAL) ||
+	    ((int)vap->va_bytes != VNOVAL) || (vap->va_gen != VNOVAL)) {
+		return (EINVAL);
 	}
-	if (ip->i_flag&ITEXT)
-		xrele(ip);	/* try once to free text */
-	if (dirremove()) {
-		ip->i_nlink--;
-		ip->i_flag |= ICHG;
+	/*
+	 * Go through the fields and update iff not VNOVAL.
+	 */
+	if (vap->va_uid != (u_short)VNOVAL || vap->va_gid != (u_short)VNOVAL)
+		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 = VOP_TRUNCATE(vp, vap->va_size, 0)) /* IO_SYNC? */
+			return (error);
 	}
-out:
-	if (dp == ip)
-		irele(ip);
-	else
-		iput(ip);
-	iput(dp);
-}
-
-/*
- * Seek system call
- */
-lseek()
-{
-	register struct file *fp;
-	register struct a {
-		int	fd;
-		off_t	off;
-		int	sbase;
-	} *uap;
-
-	uap = (struct a *)u.u_ap;
-	fp = getinode(uap->fd);
-	if (fp == NULL)
-		return;
-	if (uap->sbase == L_INCR)
-		uap->off += fp->f_offset;
-	else if (uap->sbase == L_XTND)
-		uap->off += ((struct inode *)fp->f_data)->i_size;
-	fp->f_offset = uap->off;
-	u.u_r.r_off = uap->off;
-}
-
-/*
- * Access system call
- */
-saccess()
-{
-	register svuid, svgid;
-	register struct inode *ip;
-	register struct a {
-		char	*fname;
-		int	fmode;
-	} *uap;
-
-	uap = (struct a *)u.u_ap;
-	svuid = u.u_uid;
-	svgid = u.u_gid;
-	u.u_uid = u.u_ruid;
-	u.u_gid = u.u_rgid;
-	ip = namei(uchar, LOOKUP, 1);
-	if (ip != NULL) {
-		if ((uap->fmode&R_OK) && access(ip, IREAD))
-			goto done;
-		if ((uap->fmode&W_OK) && access(ip, IWRITE))
-			goto done;
-		if ((uap->fmode&X_OK) && access(ip, IEXEC))
-			goto done;
-done:
-		iput(ip);
+	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, &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 = VOP_UPDATE(vp, &vap->va_atime, &vap->va_mtime, 1))
+			return (error);
 	}
-	u.u_uid = svuid;
-	u.u_gid = svgid;
-}
-
-/*
- * Stat system call.  This version follows links.
- */
-stat()
-{
-
-	stat1(1);
-}
-
-/*
- * Lstat system call.  This version does not follow links.
- */
-lstat()
-{
-
-	stat1(0);
-}
-
-stat1(follow)
-	int follow;
-{
-	register struct inode *ip;
-	register struct a {
-		char	*fname;
-		struct stat *ub;
-	} *uap;
-	struct stat sb;
-
-	uap = (struct a *)u.u_ap;
-	ip = namei(uchar, LOOKUP, follow);
-	if (ip == NULL)
-		return;
-	(void) statinode(ip, &sb);
-	iput(ip);
-	u.u_error = copyout((caddr_t)&sb, (caddr_t)uap->ub, sizeof (sb));
-}
-
-/*
- * Return target name of a symbolic link
- */
-readlink()
-{
-	register struct inode *ip;
-	register struct a {
-		char	*name;
-		char	*buf;
-		int	count;
-	} *uap = (struct a *)u.u_ap;
-	int resid;
-
-	ip = namei(uchar, LOOKUP, 0);
-	if (ip == NULL)
-		return;
-	if ((ip->i_mode&IFMT) != IFLNK) {
-		u.u_error = ENXIO;
-		goto out;
+	error = 0;
+	if (vap->va_mode != (u_short)VNOVAL)
+		error = ufs_chmod(vp, (int)vap->va_mode, p);
+	if (vap->va_flags != VNOVAL) {
+		if (cred->cr_uid != ip->i_uid &&
+		    (error = suser(cred, &p->p_acflag)))
+			return (error);
+		if (cred->cr_uid == 0) {
+			ip->i_flags = vap->va_flags;
+		} else {
+			ip->i_flags &= 0xffff0000;
+			ip->i_flags |= (vap->va_flags & 0xffff);
+		}
+		ip->i_flag |= ICHG;
 	}
-	u.u_error = rdwri(UIO_READ, ip, uap->buf, uap->count, 0, 0, &resid);
-out:
-	iput(ip);
-	u.u_r.r_val1 = uap->count - resid;
-}
-
-/*
- * Change mode of a file given path name.
- */
-chmod()
-{
-	struct inode *ip;
-	struct a {
-		char	*fname;
-		int	fmode;
-	} *uap;
-
-	uap = (struct a *)u.u_ap;
-	if ((ip = owner(1)) == NULL)
-		return;
-	chmod1(ip, uap->fmode);
-	iput(ip);
-}
-
-/*
- * Change mode of a file given a file descriptor.
- */
-fchmod()
-{
-	struct a {
-		int	fd;
-		int	fmode;
-	} *uap;
-	register struct inode *ip;
-	register struct file *fp;
-
-	uap = (struct a *)u.u_ap;
-	fp = getinode(uap->fd);
-	if (fp == NULL)
-		return;
-	ip = (struct inode *)fp->f_data;
-	if (u.u_uid != ip->i_uid && !suser())
-		return;
-	ilock(ip);
-	chmod1(ip, uap->fmode);
-	iunlock(ip);
+	return (error);
 }
 
 /*
  * Change the mode on a file.
  * Inode must be locked before calling.
  */
-chmod1(ip, mode)
-	register struct inode *ip;
+static int
+ufs_chmod(vp, mode, p)
+	register struct vnode *vp;
 	register int mode;
+	struct proc *p;
 {
-
-	ip->i_mode &= ~07777;
-	if (u.u_uid) {
-		mode &= ~ISVTX;
-		if (!groupmember(ip->i_gid))
-			mode &= ~ISGID;
+	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, &p->p_acflag)))
+		return (error);
+	if (cred->cr_uid) {
+		if (vp->v_type != VDIR && (mode & ISVTX))
+			return (EFTYPE);
+		if (!groupmember(ip->i_gid, cred) && (mode & ISGID))
+			return (EPERM);
 	}
-	ip->i_mode |= mode&07777;
+	ip->i_mode &= ~07777;
+	ip->i_mode |= mode & 07777;
 	ip->i_flag |= ICHG;
-	if (ip->i_flag&ITEXT && (ip->i_mode&ISVTX)==0)
-		xrele(ip);
-}
-
-/*
- * Set ownership given a path name.
- */
-chown()
-{
-	struct inode *ip;
-	struct a {
-		char	*fname;
-		int	uid;
-		int	gid;
-	} *uap;
-
-	uap = (struct a *)u.u_ap;
-	if (!suser() || (ip = owner(0)) == NULL)
-		return;
-	u.u_error = chown1(ip, uap->uid, uap->gid);
-	iput(ip);
-}
-
-/*
- * Set ownership given a file descriptor.
- */
-fchown()
-{
-	struct a {
-		int	fd;
-		int	uid;
-		int	gid;
-	} *uap;
-	register struct inode *ip;
-	register struct file *fp;
-
-	uap = (struct a *)u.u_ap;
-	fp = getinode(uap->fd);
-	if (fp == NULL)
-		return;
-	ip = (struct inode *)fp->f_data;
-	if (!suser())
-		return;
-	ilock(ip);
-	u.u_error = chown1(ip, uap->uid, uap->gid);
-	iunlock(ip);
+	if ((vp->v_flag & VTEXT) && (ip->i_mode & ISVTX) == 0)
+		(void) vnode_pager_uncache(vp);
+	return (0);
 }
 
 /*
  * Perform chown operation on inode ip;
  * inode must be locked prior to call.
  */
-chown1(ip, uid, gid)
-	register struct inode *ip;
-	int uid, gid;
+static int
+ufs_chown(vp, uid, gid, p)
+	register struct vnode *vp;
+	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;
 #ifdef QUOTA
-	register long change;
+	register int i;
+	long change;
 #endif
 
-	if (uid == -1)
+	if (uid == (u_short)VNOVAL)
 		uid = ip->i_uid;
-	if (gid == -1)
+	if (gid == (u_short)VNOVAL)
 		gid = ip->i_gid;
+	/*
+	 * If we don't own the file, are trying to change the owner
+	 * of the file, or are not a member of the target group,
+	 * the caller must be superuser or the call fails.
+	 */
+	if ((cred->cr_uid != ip->i_uid || uid != ip->i_uid ||
+	    !groupmember((gid_t)gid, cred)) &&
+	    (error = suser(cred, &p->p_acflag)))
+		return (error);
+	ouid = ip->i_uid;
+	ogid = ip->i_gid;
 #ifdef QUOTA
-	if (ip->i_uid != uid)		/* this just speeds things a little */
-		change = 0;
-	else
-		change = ip->i_blocks;
-	(void) chkdq(ip, -change, 1);
-	(void) chkiq(ip->i_dev, ip, ip->i_uid, 1);
-	dqrele(ip->i_dquot);
+	if (error = getinoquota(ip))
+		return (error);
+	if (ouid == uid) {
+		dqrele(vp, ip->i_dquot[USRQUOTA]);
+		ip->i_dquot[USRQUOTA] = NODQUOT;
+	}
+	if (ogid == gid) {
+		dqrele(vp, ip->i_dquot[GRPQUOTA]);
+		ip->i_dquot[GRPQUOTA] = NODQUOT;
+	}
+	change = ip->i_blocks;
+	(void) chkdq(ip, -change, cred, CHOWN);
+	(void) chkiq(ip, -1, cred, CHOWN);
+	for (i = 0; i < MAXQUOTAS; i++) {
+		dqrele(vp, ip->i_dquot[i]);
+		ip->i_dquot[i] = NODQUOT;
+	}
 #endif
 	ip->i_uid = uid;
 	ip->i_gid = gid;
-	ip->i_flag |= ICHG;
-	if (u.u_ruid != 0)
-		ip->i_mode &= ~(ISUID|ISGID);
 #ifdef QUOTA
-	ip->i_dquot = inoquota(ip);
-	(void) chkdq(ip, change, 1);
-	(void) chkiq(ip->i_dev, (struct inode *)NULL, uid, 1);
-	return (u.u_error);		/* should == 0 ALWAYS !! */
-#else
+	if ((error = getinoquota(ip)) == 0) {
+		if (ouid == uid) {
+			dqrele(vp, ip->i_dquot[USRQUOTA]);
+			ip->i_dquot[USRQUOTA] = NODQUOT;
+		}
+		if (ogid == gid) {
+			dqrele(vp, ip->i_dquot[GRPQUOTA]);
+			ip->i_dquot[GRPQUOTA] = NODQUOT;
+		}
+		if ((error = chkdq(ip, change, cred, CHOWN)) == 0) {
+			if ((error = chkiq(ip, 1, cred, CHOWN)) == 0)
+				goto good;
+			else
+				(void) chkdq(ip, -change, cred, CHOWN|FORCE);
+		}
+		for (i = 0; i < MAXQUOTAS; i++) {
+			dqrele(vp, ip->i_dquot[i]);
+			ip->i_dquot[i] = NODQUOT;
+		}
+	}
+	ip->i_uid = ouid;
+	ip->i_gid = ogid;
+	if (getinoquota(ip) == 0) {
+		if (ouid == uid) {
+			dqrele(vp, ip->i_dquot[USRQUOTA]);
+			ip->i_dquot[USRQUOTA] = NODQUOT;
+		}
+		if (ogid == gid) {
+			dqrele(vp, ip->i_dquot[GRPQUOTA]);
+			ip->i_dquot[GRPQUOTA] = NODQUOT;
+		}
+		(void) chkdq(ip, change, cred, FORCE|CHOWN);
+		(void) chkiq(ip, 1, cred, FORCE|CHOWN);
+		(void) getinoquota(ip);
+	}
+	return (error);
+good:
+	if (getinoquota(ip))
+		panic("chown: lost quota");
+#endif /* QUOTA */
+	if (ouid != uid || ogid != gid)
+		ip->i_flag |= ICHG;
+	if (ouid != uid && cred->cr_uid != 0)
+		ip->i_mode &= ~ISUID;
+	if (ogid != gid && cred->cr_uid != 0)
+		ip->i_mode &= ~ISGID;
 	return (0);
-#endif
 }
 
-utimes()
+/* ARGSUSED */
+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;
 {
-	register struct a {
-		char	*fname;
-		struct	timeval *tptr;
-	} *uap = (struct a *)u.u_ap;
-	register struct inode *ip;
-	struct timeval tv[2];
-
-	if ((ip = owner(1)) == NULL)
-		return;
-	u.u_error = copyin((caddr_t)uap->tptr, (caddr_t)tv, sizeof (tv));
-	if (u.u_error == 0) {
-		ip->i_flag |= IACC|IUPD|ICHG;
-		iupdat(ip, &tv[0], &tv[1], 0);
-	}
-	iput(ip);
+
+	return (ENOTTY);
 }
 
-/*
- * Flush any pending I/O.
- */
-sync()
+/* ARGSUSED */
+int
+ufs_select(vp, which, fflags, cred, p)
+	struct vnode *vp;
+	int which, fflags;
+	struct ucred *cred;
+	struct proc *p;
 {
 
-	update();
+	/*
+	 * We should really check to see if I/O is possible.
+	 */
+	return (1);
 }
 
 /*
- * Apply an advisory lock on a file descriptor.
+ * Mmap a file
+ *
+ * NB Currently unsupported.
  */
-flock()
+/* ARGSUSED */
+int
+ufs_mmap(vp, fflags, cred, p)
+	struct vnode *vp;
+	int fflags;
+	struct ucred *cred;
+	struct proc *p;
 {
-	register struct a {
-		int	fd;
-		int	how;
-	} *uap = (struct a *)u.u_ap;
-	register struct file *fp;
-	register int cmd, flags;
-
-	fp = getinode(uap->fd);
-	if (fp == NULL)
-		return;
-	cmd = uap->how;
-	flags = u.u_pofile[uap->fd] & (UF_SHLOCK|UF_EXLOCK);
-	if (cmd&LOCK_UN) {
-		if (flags == 0) {
-			u.u_error = EINVAL;
-			return;
-		}
-		funlocki((struct inode *)fp->f_data, flags);
-		u.u_pofile[uap->fd] &= ~(UF_SHLOCK|UF_EXLOCK);
-		return;
-	}
-	/*
-	 * No reason to write lock a file we've already
-	 * write locked, similarly with a read lock.
-	 */
-	if ((flags&UF_EXLOCK) && (cmd&LOCK_EX) ||
-	    (flags&UF_SHLOCK) && (cmd&LOCK_SH))
-		return;
-	u.u_pofile[uap->fd] =
-	    flocki((struct inode *)fp->f_data, u.u_pofile[uap->fd], cmd);
+
+	return (EINVAL);
 }
 
 /*
- * Truncate a file given its path name.
+ * Seek on a file
+ *
+ * Nothing to do, so just return.
  */
-truncate()
+/* ARGSUSED */
+int
+ufs_seek(vp, oldoff, newoff, cred)
+	struct vnode *vp;
+	off_t oldoff, newoff;
+	struct ucred *cred;
 {
-	struct a {
-		char	*fname;
-		u_long	length;
-	} *uap = (struct a *)u.u_ap;
-	struct inode *ip;
-
-	ip = namei(uchar, LOOKUP, 1);
-	if (ip == NULL)
-		return;
-	if (access(ip, IWRITE))
-		goto bad;
-	if ((ip->i_mode&IFMT) == IFDIR) {
-		u.u_error = EISDIR;
-		goto bad;
-	}
-	itrunc(ip, uap->length);
-bad:
-	iput(ip);
+
+	return (0);
 }
 
 /*
- * Truncate a file given a file descriptor.
+ * ufs remove
+ * Hard to avoid races here, especially
+ * in unlinking directories.
  */
-ftruncate()
+int
+ufs_remove(ndp, p)
+	struct nameidata *ndp;
+	struct proc *p;
 {
-	struct a {
-		int	fd;
-		u_long	length;
-	} *uap = (struct a *)u.u_ap;
-	struct inode *ip;
-	struct file *fp;
-
-	fp = getinode(uap->fd);
-	if (fp == NULL)
-		return;
-	if ((fp->f_flag&FWRITE) == 0) {
-		u.u_error = EINVAL;
-		return;
+	register struct inode *ip, *dp;
+	int error;
+
+	ip = VTOI(ndp->ni_vp);
+	dp = VTOI(ndp->ni_dvp);
+	error = ufs_dirremove(ndp);
+	if (!error) {
+		ip->i_nlink--;
+		ip->i_flag |= ICHG;
 	}
-	ip = (struct inode *)fp->f_data;
-	ilock(ip);
-	itrunc(ip, uap->length);
-	iunlock(ip);
+	if (dp == ip)
+		vrele(ITOV(ip));
+	else
+		ufs_iput(ip);
+	ufs_iput(dp);
+	return (error);
 }
 
 /*
- * Synch an open file.
+ * link vnode call
  */
-fsync()
+int
+ufs_link(vp, ndp, p)
+	register struct vnode *vp;
+	register struct nameidata *ndp;
+	struct proc *p;
 {
-	struct a {
-		int	fd;
-	} *uap = (struct a *)u.u_ap;
-	struct inode *ip;
-	struct file *fp;
-
-	fp = getinode(uap->fd);
-	if (fp == NULL)
-		return;
-	ip = (struct inode *)fp->f_data;
-	ilock(ip);
-	syncip(ip);
-	iunlock(ip);
+	register struct inode *ip;
+	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);
+	ip->i_nlink++;
+	ip->i_flag |= ICHG;
+	error = VOP_UPDATE(vp, &time, &time, 1);
+	if (!error)
+		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;
+	}
+	return (error);
 }
 
 /*
@@ -770,56 +587,70 @@ fsync()
  * Basic algorithm is:
  *
  * 1) Bump link count on source while we're linking it to the
- *    target.  This also insure the inode won't be deleted out
- *    from underneath us while we work.
+ *    target.  This also ensure the inode won't be deleted out
+ *    from underneath us while we work (it may be truncated by
+ *    a concurrent `trunc' or `open' for creation).
  * 2) Link source to destination.  If destination already exists,
  *    delete it first.
- * 3) Unlink source reference to inode if still around.
- * 4) If a directory was moved and the parent of the destination
+ * 3) Unlink source reference to inode if still around. If a
+ *    directory was moved and the parent of the destination
  *    is different from the source, patch the ".." entry in the
  *    directory.
- *
- * Source and destination must either both be directories, or both
- * not be directories.  If target is a directory, it must be empty.
  */
-rename()
+int
+ufs_rename(fndp, tndp, p)
+	register struct nameidata *fndp, *tndp;
+	struct proc *p;
 {
-	struct a {
-		char	*from;
-		char	*to;
-	} *uap;
 	register struct inode *ip, *xp, *dp;
-	int oldparent, parentdifferent, doingdirectory;
+	struct dirtemplate dirbuf;
+	int doingdirectory = 0, oldparent = 0, newparent = 0;
 	int error = 0;
 
-	uap = (struct a *)u.u_ap;
-	ip = namei(uchar, DELETE | LOCKPARENT, 0);
-	if (ip == NULL)
-		return;
-	dp = u.u_pdir;
-	oldparent = 0, doingdirectory = 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;
-
-		d = &u.u_dent;
 		/*
 		 * Avoid ".", "..", and aliases of "." for obvious reasons.
 		 */
-		if ((d->d_namlen == 1 && d->d_name[0] == '.') ||
-		    (d->d_namlen == 2 && bcmp(d->d_name, "..", 2) == 0) ||
-		    (dp == ip)) {
-			iput(dp);
-			if (dp == ip)
-				irele(ip);
-			else
-				iput(ip);
-			u.u_error = EINVAL;
-			return;
+		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)
+				vput(tndp->ni_vp);
+			VOP_ABORTOP(fndp);
+			vrele(fndp->ni_dvp);
+			vput(fndp->ni_vp);
+			return (EINVAL);
 		}
+		ip->i_flag |= IRENAME;
 		oldparent = dp->i_number;
 		doingdirectory++;
 	}
-	iput(dp);
+	vrele(fndp->ni_dvp);
 
 	/*
 	 * 1) Bump link count while we're moving stuff
@@ -829,20 +660,17 @@ rename()
 	 */
 	ip->i_nlink++;
 	ip->i_flag |= ICHG;
-	iupdat(ip, &time, &time, 1);
-	iunlock(ip);
+	error = VOP_UPDATE(fndp->ni_vp, &time, &time, 1);
+	IUNLOCK(ip);
 
 	/*
 	 * When the target exists, both the directory
-	 * and target inodes are returned locked.
+	 * and target vnodes are returned locked.
 	 */
-	u.u_dirp = (caddr_t)uap->to;
-	xp = namei(uchar, CREATE | LOCKPARENT, 0);
-	if (u.u_error) {
-		error = u.u_error;
-		goto out;
-	}
-	dp = u.u_pdir;
+	dp = VTOI(tndp->ni_dvp);
+	xp = NULL;
+	if (tndp->ni_vp)
+		xp = VTOI(tndp->ni_vp);
 	/*
 	 * If ".." must be changed (ie the directory gets a new
 	 * parent) then the source directory must not be in the
@@ -853,24 +681,27 @@ rename()
 	 * to namei, as the parent directory is unlocked by the
 	 * call to checkpath().
 	 */
-	parentdifferent = oldparent != dp->i_number;
-	if (doingdirectory && parentdifferent) {
-		if (access(ip, IWRITE))
+	if (oldparent != dp->i_number)
+		newparent = dp->i_number;
+	if (doingdirectory && newparent) {
+		VOP_LOCK(fndp->ni_vp);
+		error = ufs_access(fndp->ni_vp, VWRITE, tndp->ni_cred, p);
+		VOP_UNLOCK(fndp->ni_vp);
+		if (error)
 			goto bad;
-		do {
-			dp = u.u_pdir;
-			if (xp != NULL)
-				iput(xp);
-			u.u_error = checkpath(ip, dp);
-			if (u.u_error)
-				goto out;
-			u.u_dirp = (caddr_t)uap->to;
-			xp = namei(uchar, CREATE | LOCKPARENT, 0);
-			if (u.u_error) {
-				error = u.u_error;
-				goto out;
-			}
-		} while (dp != u.u_pdir);
+		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
@@ -880,44 +711,60 @@ rename()
 	 *    expunge the original entry's existence.
 	 */
 	if (xp == NULL) {
-		if (dp->i_dev != ip->i_dev) {
-			error = EXDEV;
-			goto bad;
-		}
+		if (dp->i_dev != ip->i_dev)
+			panic("rename: EXDEV");
 		/*
-		 * Account for ".." in directory.
-		 * When source and destination have the
-		 * same parent we don't fool with the
-		 * link count -- this isn't required
-		 * because we do a similar check below.
+		 * Account for ".." in new directory.
+		 * When source and destination have the same
+		 * parent we don't fool with the link count.
 		 */
-		if (doingdirectory && parentdifferent) {
+		if (doingdirectory && newparent) {
+			if ((unsigned short)dp->i_nlink >= LINK_MAX) {
+				error = EMLINK;
+				goto bad;
+			}
 			dp->i_nlink++;
 			dp->i_flag |= ICHG;
-			iupdat(dp, &time, &time, 1);
+			if (error = VOP_UPDATE(ITOV(dp), &time, &time, 1))
+				goto bad;
 		}
-		error = direnter(ip);
-		if (error)
-			goto out;
-	} else {
-		if (xp->i_dev != dp->i_dev || xp->i_dev != ip->i_dev) {
-			error = EXDEV;
+		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");
 		/*
 		 * Short circuit rename(foo, foo).
 		 */
 		if (xp->i_number == ip->i_number)
+			panic("rename: same file");
+		/*
+		 * If the parent directory is "sticky", then the user must
+		 * own the parent directory, or the destination of the rename,
+		 * otherwise the destination may not be changed (except by
+		 * root). This implements append-only directories.
+		 */
+		if ((dp->i_mode & ISVTX) && tndp->ni_cred->cr_uid != 0 &&
+		    tndp->ni_cred->cr_uid != dp->i_uid &&
+		    xp->i_uid != tndp->ni_cred->cr_uid) {
+			error = EPERM;
 			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) || xp->i_nlink > 2) {
+			if (!ufs_dirempty(xp, dp->i_number, tndp->ni_cred) || 
+			    xp->i_nlink > 2) {
 				error = ENOTEMPTY;
 				goto bad;
 			}
@@ -925,15 +772,24 @@ rename()
 				error = ENOTDIR;
 				goto bad;
 			}
+			cache_purge(ITOV(dp));
 		} else if (doingdirectory) {
 			error = EISDIR;
 			goto bad;
 		}
-		dirrewrite(dp, ip);
-		if (u.u_error) {
-			error = u.u_error;
-			goto bad1;
+		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;
 		}
+		ufs_iput(dp);
 		/*
 		 * Adjust the link count of the target to
 		 * reflect the dirrewrite above.  If this is
@@ -941,169 +797,117 @@ rename()
 		 * no links to it, so we can squash the inode and
 		 * any space associated with it.  We disallowed
 		 * renaming over top of a directory with links to
-		 * it above, as we've no way to determine if
-		 * we've got a link or the directory itself, and
-		 * if we get a link, then ".." will be screwed up.
+		 * it above, as the remaining link would point to
+		 * a directory without "." or ".." entries.
 		 */
 		xp->i_nlink--;
 		if (doingdirectory) {
 			if (--xp->i_nlink != 0)
 				panic("rename: linked directory");
-			itrunc(xp, (u_long)0);
+			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.
 	 */
-	u.u_dirp = uap->from;
-	dp = namei(uchar, DELETE, 0);
+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 {
+		/*
+		 * From name has disappeared.
+		 */
+		if (doingdirectory)
+			panic("rename: lost dir entry");
+		vrele(ITOV(ip));
+		return (0);
+	}
 	/*
-	 * Insure directory entry still exists and
-	 * has not changed since the start of all
-	 * this.  If either has occured, forget about
-	 * about deleting the original entry and just
-	 * adjust the link count in the inode.
+	 * Ensure that the directory entry still exists and has not
+	 * changed while the new name has been entered. If the source is
+	 * a file then the entry may have been unlinked or renamed. In
+	 * either case there is no further work to be done. If the source
+	 * is a directory then it cannot have been rmdir'ed; its link
+	 * count of three would cause a rmdir to fail with ENOTEMPTY.
+	 * The IRENAME flag ensures that it cannot be moved by another
+	 * rename.
 	 */
-	if (dp == NULL || u.u_dent.d_ino != ip->i_number) {
-		ip->i_nlink--;
-		ip->i_flag |= ICHG;
+	if (xp != ip) {
+		if (doingdirectory)
+			panic("rename: lost dir entry");
 	} else {
 		/*
-		 * If source is a directory, must adjust
-		 * link count of parent directory also.
-		 * If target didn't exist and source and
-		 * target have the same parent, then we
-		 * needn't touch the link count, it all
-		 * balances out in the end.  Otherwise, we
-		 * must do so to reflect deletion of ".."
-		 * done above.
+		 * If the source is a directory with a
+		 * new parent, the link count of the old
+		 * parent directory must be decremented
+		 * and ".." set to point to the new parent.
 		 */
-		if (doingdirectory && (xp != NULL || parentdifferent)) {
+		if (doingdirectory && newparent) {
 			dp->i_nlink--;
 			dp->i_flag |= ICHG;
+			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, (struct proc *)0);
+			if (error == 0) {
+				if (dirbuf.dotdot_namlen != 2 ||
+				    dirbuf.dotdot_name[0] != '.' ||
+				    dirbuf.dotdot_name[1] != '.') {
+					ufs_dirbad(xp, 12,
+					    "rename: mangled dir");
+				} else {
+					dirbuf.dotdot_ino = newparent;
+					(void) vn_rdwr(UIO_WRITE, ITOV(xp),
+					    (caddr_t)&dirbuf,
+					    sizeof (struct dirtemplate),
+					    (off_t)0, UIO_SYSSPACE,
+					    IO_NODELOCKED|IO_SYNC,
+					    tndp->ni_cred, (int *)0,
+					    (struct proc *)0);
+					cache_purge(ITOV(dp));
+				}
+			}
 		}
-		if (dirremove()) {
-			ip->i_nlink--;
-			ip->i_flag |= ICHG;
+		error = ufs_dirremove(fndp);
+		if (!error) {
+			xp->i_nlink--;
+			xp->i_flag |= ICHG;
 		}
-		if (error == 0)		/* conservative */
-			error = u.u_error;
+		xp->i_flag &= ~IRENAME;
 	}
-	irele(ip);
 	if (dp)
-		iput(dp);
-
-	/*
-	 * 4) Renaming a directory with the parent
-	 *    different requires ".." to be rewritten.
-	 *    The window is still there for ".." to
-	 *    be inconsistent, but this is unavoidable,
-	 *    and a lot shorter than when it was done
-	 *    in a user process.
-	 */
-	if (doingdirectory && parentdifferent && error == 0) {
-		struct dirtemplate dirbuf;
-
-		u.u_dirp = uap->to;
-		ip = namei(uchar, LOOKUP | LOCKPARENT, 0);
-		if (ip == NULL) {
-			printf("rename: .. went away\n");
-			return;
-		}
-		dp = u.u_pdir;
-		if ((ip->i_mode&IFMT) != IFDIR) {
-			printf("rename: .. not a directory\n");
-			goto stuck;
-		}
-		error = rdwri(UIO_READ, ip, (caddr_t)&dirbuf,
-			sizeof (struct dirtemplate), (off_t)0, 1, (int *)0);
-		if (error == 0) {
-			dirbuf.dotdot_ino = dp->i_number;
-			(void) rdwri(UIO_WRITE, ip, (caddr_t)&dirbuf,
-			  sizeof (struct dirtemplate), (off_t)0, 1, (int *)0);
-		}
-stuck:
-		irele(dp);
-		iput(ip);
-	}
-	goto done;
+		vput(ITOV(dp));
+	if (xp)
+		vput(ITOV(xp));
+	vrele(ITOV(ip));
+	return (error);
 
 bad:
-	iput(dp);
-bad1:
 	if (xp)
-		iput(xp);
+		vput(ITOV(xp));
+	vput(ITOV(dp));
 out:
 	ip->i_nlink--;
 	ip->i_flag |= ICHG;
-	irele(ip);
-done:
-	if (error)
-		u.u_error = error;
-}
-
-/*
- * Make a new file.
- */
-struct inode *
-maknode(mode)
-	int mode;
-{
-	register struct inode *ip;
-	ino_t ipref;
-
-	if ((mode & IFMT) == IFDIR)
-		ipref = dirpref(u.u_pdir->i_fs);
-	else
-		ipref = u.u_pdir->i_number;
-	ip = ialloc(u.u_pdir, ipref, mode);
-	if (ip == NULL) {
-		iput(u.u_pdir);
-		return (NULL);
-	}
-#ifdef QUOTA
-	if (ip->i_dquot != NODQUOT)
-		panic("maknode: dquot");
-#endif
-	ip->i_flag |= IACC|IUPD|ICHG;
-	if ((mode & IFMT) == 0)
-		mode |= IFREG;
-	ip->i_mode = mode & ~u.u_cmask;
-	ip->i_nlink = 1;
-	ip->i_uid = u.u_uid;
-	ip->i_gid = u.u_pdir->i_gid;
-	if (ip->i_mode & ISGID && !groupmember(ip->i_gid))
-		ip->i_mode &= ~ISGID;
-#ifdef QUOTA
-	ip->i_dquot = inoquota(ip);
-#endif
-
-	/*
-	 * Make sure inode goes to disk before directory entry.
-	 */
-	iupdat(ip, &time, &time, 1);
-	u.u_error = direnter(ip);
-	if (u.u_error) {
-		/*
-		 * Write error occurred trying to update directory
-		 * so must deallocate the inode.
-		 */
-		ip->i_nlink = 0;
-		ip->i_flag |= ICHG;
-		iput(ip);
-		return (NULL);
-	}
-	return (ip);
+	vrele(ITOV(ip));
+	return (error);
 }
 
 /*
  * A virgin directory (no blushing please).
  */
-struct dirtemplate mastertemplate = {
+static struct dirtemplate mastertemplate = {
 	0, 12, 1, ".",
 	0, DIRBLKSIZ - 12, 2, ".."
 };
@@ -1111,52 +915,60 @@ struct dirtemplate mastertemplate = {
 /*
  * Mkdir system call
  */
-mkdir()
+int
+ufs_mkdir(ndp, vap, p)
+	struct nameidata *ndp;
+	struct vattr *vap;
+	struct proc *p;
 {
-	struct a {
-		char	*name;
-		int	dmode;
-	} *uap;
 	register struct inode *ip, *dp;
+	struct vnode *tvp;
+	struct vnode *dvp;
 	struct dirtemplate dirtemplate;
+	int error;
+	int dmode;
 
-	uap = (struct a *)u.u_ap;
-	ip = namei(uchar, CREATE, 0);
-	if (u.u_error)
-		return;
-	if (ip != NULL) {
-		iput(ip);
-		u.u_error = EEXIST;
-		return;
+#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);
 	}
-	dp = u.u_pdir;
-	uap->dmode &= 0777;
-	uap->dmode |= IFDIR;
+	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.
 	 */
-	ip = ialloc(dp, dirpref(dp->i_fs), uap->dmode);
-	if (ip == NULL) {
-		iput(dp);
-		return;
+	if (error = VOP_VALLOC(dvp, dmode, ndp->ni_cred, &tvp)) {
+		free(ndp->ni_pnbuf, M_NAMEI);
+		ufs_iput(dp);
+		return (error);
 	}
+	ip = VTOI(tvp);
+	ip->i_uid = ndp->ni_cred->cr_uid;
+	ip->i_gid = dp->i_gid;
 #ifdef QUOTA
-	if (ip->i_dquot != NODQUOT)
-		panic("mkdir: dquot");
+	if ((error = getinoquota(ip)) ||
+	    (error = chkiq(ip, 1, ndp->ni_cred, 0))) {
+		free(ndp->ni_pnbuf, M_NAMEI);
+		VOP_VFREE(tvp, ip->i_number, dmode);
+		ufs_iput(ip);
+		ufs_iput(dp);
+		return (error);
+	}
 #endif
 	ip->i_flag |= IACC|IUPD|ICHG;
-	ip->i_mode = uap->dmode & ~u.u_cmask;
+	ip->i_mode = dmode;
+	ITOV(ip)->v_type = VDIR;	/* Rest init'd in iget() */
 	ip->i_nlink = 2;
-	ip->i_uid = u.u_uid;
-	ip->i_gid = dp->i_gid;
-#ifdef QUOTA
-	ip->i_dquot = inoquota(ip);
-#endif
-	iupdat(ip, &time, &time, 1);
+	error = VOP_UPDATE(ITOV(ip), &time, &time, 1);
 
 	/*
 	 * Bump link count in parent directory
@@ -1166,85 +978,69 @@ mkdir()
 	 */
 	dp->i_nlink++;
 	dp->i_flag |= ICHG;
-	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;
-	u.u_error = rdwri(UIO_WRITE, ip, (caddr_t)&dirtemplate,
-		sizeof (dirtemplate), (off_t)0, 1, (int *)0);
-	if (u.u_error) {
+	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, (struct proc *)0);
+	if (error) {
 		dp->i_nlink--;
 		dp->i_flag |= ICHG;
 		goto bad;
 	}
-	/*
-	 * Directory all set up, now
-	 * install the entry for it in
-	 * the parent directory.
-	 */
-	u.u_error = direnter(ip);
-	dp = NULL;
-	if (u.u_error) {
-		u.u_dirp = uap->name;
-		dp = namei(uchar, LOOKUP, 0);
-		if (dp) {
-			dp->i_nlink--;
-			dp->i_flag |= ICHG;
-		}
+	if (DIRBLKSIZ > VFSTOUFS(dvp->v_mount)->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 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,
-	 * irele 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 (u.u_error) {
+	if (error) {
 		ip->i_nlink = 0;
 		ip->i_flag |= ICHG;
-	}
-	if (dp)
-		iput(dp);
-	iput(ip);
+		ufs_iput(ip);
+	} else
+		ndp->ni_vp = ITOV(ip);
+	FREE(ndp->ni_pnbuf, M_NAMEI);
+	ufs_iput(dp);
+	return (error);
 }
 
 /*
  * Rmdir system call.
  */
-rmdir()
+int
+ufs_rmdir(ndp, p)
+	register struct nameidata *ndp;
+	struct proc *p;
 {
-	struct a {
-		char	*name;
-	};
 	register struct inode *ip, *dp;
+	int error;
 
-	ip = namei(uchar, DELETE | LOCKPARENT, 0);
-	if (ip == NULL)
-		return;
-	dp = u.u_pdir;
+	ip = VTOI(ndp->ni_vp);
+	dp = VTOI(ndp->ni_dvp);
 	/*
 	 * No rmdir "." please.
 	 */
 	if (dp == ip) {
-		irele(dp);
-		iput(ip);
-		u.u_error = EINVAL;
-		return;
-	}
-	if ((ip->i_mode&IFMT) != IFDIR) {
-		u.u_error = ENOTDIR;
-		goto out;
-	}
-	/*
-	 * Don't remove a mounted on directory.
-	 */
-	if (ip->i_dev != dp->i_dev) {
-		u.u_error = EBUSY;
-		goto out;
+		vrele(ndp->ni_dvp);
+		ufs_iput(ip);
+		return (EINVAL);
 	}
 	/*
 	 * Verify the directory is empty (and valid).
@@ -1253,8 +1049,10 @@ rmdir()
 	 *  the current directory and thus be
 	 *  non-empty.)
 	 */
-	if (ip->i_nlink != 2 || !dirempty(ip)) {
-		u.u_error = ENOTEMPTY;
+	error = 0;
+	if (ip->i_nlink != 2 ||
+	    !ufs_dirempty(ip, dp->i_number, ndp->ni_cred)) {
+		error = ENOTEMPTY;
 		goto out;
 	}
 	/*
@@ -1262,12 +1060,13 @@ rmdir()
 	 * inode.  If we crash in between, the directory
 	 * will be reattached to lost+found,
 	 */
-	if (dirremove() == 0)
+	if (error = ufs_dirremove(ndp))
 		goto out;
 	dp->i_nlink--;
 	dp->i_flag |= ICHG;
-	iput(dp);
-	dp = NULL;
+	cache_purge(ndp->ni_dvp);
+	ufs_iput(dp);
+	ndp->ni_dvp = NULL;
 	/*
 	 * Truncate inode.  The only stuff left
 	 * in the directory is "." and "..".  The
@@ -1280,39 +1079,520 @@ rmdir()
 	 * worry about them later.
 	 */
 	ip->i_nlink -= 2;
-	itrunc(ip, (u_long)0);
+	error = VOP_TRUNCATE(ndp->ni_vp, (u_long)0, IO_SYNC);
+	cache_purge(ITOV(ip));
 out:
-	if (dp)
-		iput(dp);
-	iput(ip);
+	if (ndp->ni_dvp)
+		ufs_iput(dp);
+	ufs_iput(ip);
+	return (error);
+}
+
+/*
+ * symlink -- make a symbolic link
+ */
+int
+ufs_symlink(ndp, vap, target, p)
+	struct nameidata *ndp;
+	struct vattr *vap;
+	char *target;
+	struct proc *p;
+{
+	struct vnode *vp;
+	int error;
+
+	if (error = ufs_makeinode(IFLNK | vap->va_mode, ndp, &vp))
+		return (error);
+	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;
+	struct ucred *cred;
+	int *eofflagp;
+{
+	int count, lost, error;
+
+	count = uio->uio_resid;
+	count &= ~(DIRBLKSIZ - 1);
+	lost = uio->uio_resid - count;
+	if (count < DIRBLKSIZ || (uio->uio_offset & (DIRBLKSIZ -1)))
+		return (EINVAL);
+	uio->uio_resid = count;
+	uio->uio_iov->iov_len = count;
+	error = VOP_READ(vp, uio, 0, cred);
+	uio->uio_resid += lost;
+	if ((VTOI(vp)->i_size - uio->uio_offset) <= 0)
+		*eofflagp = 1;
+	else
+		*eofflagp = 0;
+	return (error);
+}
+
+/*
+ * Return target name of a symbolic link
+ */
+int
+ufs_readlink(vp, uiop, cred)
+	struct vnode *vp;
+	struct uio *uiop;
+	struct ucred *cred;
+{
+
+	return (VOP_READ(vp, uiop, 0, cred));
 }
 
-struct file *
-getinode(fdes)
-	int fdes;
+/*
+ * Ufs abort op, called after namei() when a CREATE/DELETE isn't actually
+ * 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;
+{
+	register struct inode *ip = VTOI(vp);
+
+	ILOCK(ip);
+	return (0);
+}
+
+/*
+ * Unlock an inode.
+ */
+int
+ufs_unlock(vp)
+	struct vnode *vp;
+{
+	register struct inode *ip = VTOI(vp);
+
+	if (!(ip->i_flag & ILOCKED))
+		panic("ufs_unlock NOT LOCKED");
+	IUNLOCK(ip);
+	return (0);
+}
+
+/*
+ * Check for a locked inode.
+ */
+int
+ufs_islocked(vp)
+	struct vnode *vp;
 {
-	register struct file *fp;
 
-	fp = getf(fdes);
-	if (fp == 0)
+	if (VTOI(vp)->i_flag & ILOCKED)
+		return (1);
+	return (0);
+}
+
+/*
+ * 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;
+	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 =
+		    VOP_BMAP(bp->b_vp, bp->b_lblkno, NULL, &bp->b_blkno))
+			return (error);
+		if ((long)bp->b_blkno == -1)
+			clrbuf(bp);
+	}
+	if ((long)bp->b_blkno == -1) {
+		biodone(bp);
 		return (0);
-	if (fp->f_type != DTYPE_INODE) {
-		u.u_error = EINVAL;
+	}
+#ifdef 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->vop_strategy)(bp);
+	return (0);
+}
+
+/*
+ * Print out the contents of an inode.
+ */
+int
+ufs_print(vp)
+	struct vnode *vp;
+{
+	register struct inode *ip = VTOI(vp);
+
+	printf("tag VT_UFS, ino %d, on dev %d, %d", ip->i_number,
+		major(ip->i_dev), minor(ip->i_dev));
+#ifdef FIFO
+	if (vp->v_type == VFIFO)
+		fifo_printinfo(vp);
+#endif /* FIFO */
+	printf("%s\n", (ip->i_flag & ILOCKED) ? " (LOCKED)" : "");
+	if (ip->i_spare0 == 0)
 		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;
+	int ioflag;
+	struct ucred *cred;
+{
+
+	/*
+	 * Set access flag.
+	 */
+	VTOI(vp)->i_flag |= IACC;
+	return (spec_read(vp, uio, ioflag, cred));
+}
+
+/*
+ * Write wrapper for special devices.
+ */
+int
+ufsspec_write(vp, uio, ioflag, cred)
+	struct vnode *vp;
+	struct uio *uio;
+	int ioflag;
+	struct ucred *cred;
+{
+
+	/*
+	 * Set update and change flags.
+	 */
+	VTOI(vp)->i_flag |= IUPD|ICHG;
+	return (spec_write(vp, uio, ioflag, cred));
+}
+
+/*
+ * Close wrapper for special devices.
+ *
+ * Update the times on the inode then do device close.
+ */
+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, p));
+}
+
+#ifdef FIFO
+/*
+ * Read wrapper for fifo's
+ */
+int
+ufsfifo_read(vp, uio, ioflag, cred)
+	struct vnode *vp;
+	struct uio *uio;
+	int ioflag;
+	struct ucred *cred;
+{
+
+	/*
+	 * Set access flag.
+	 */
+	VTOI(vp)->i_flag |= IACC;
+	return (fifo_read(vp, uio, ioflag, cred));
+}
+
+/*
+ * Write wrapper for fifo's.
+ */
+int
+ufsfifo_write(vp, uio, ioflag, cred)
+	struct vnode *vp;
+	struct uio *uio;
+	int ioflag;
+	struct ucred *cred;
+{
+
+	/*
+	 * Set update and change flags.
+	 */
+	VTOI(vp)->i_flag |= IUPD|ICHG;
+	return (fifo_write(vp, uio, ioflag, cred));
+}
+
+/*
+ * Close wrapper for fifo's.
+ *
+ * Update the times on the inode then do device close.
+ */
+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, p));
+}
+#endif /* FIFO */
+
+/*
+ * 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, specops, fifoops, vpp)
+	struct mount *mntp;
+	struct vnodeops *specops, *fifoops;
+	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 = specops;
+		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 = fifoops;
+		break;
+#else
+		return (EOPNOTSUPP);
+#endif
 	}
-	return (fp);
+	if (ip->i_number == ROOTINO)
+                vp->v_flag |= VROOT;
+	*vpp = vp;
+	return (0);
 }
 
 /*
- * mode mask for creation of files
+ * Allocate a new inode.
  */
-umask()
+int
+ufs_makeinode(mode, ndp, vpp)
+	int mode;
+	register struct nameidata *ndp;
+	struct vnode **vpp;
 {
-	register struct a {
-		int	mask;
-	} *uap;
+	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;
 
-	uap = (struct a *)u.u_ap;
-	u.u_r.r_val1 = u.u_cmask;
-	u.u_cmask = uap->mask & 07777;
+	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;
+
+	/*
+	 * Make sure inode goes to disk before directory entry.
+	 */
+	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);
+
+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);
 }