update rename to use new namei / lookup scheme

[unix-history] / 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 9be11ea..4757e49 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -2,118 +2,40 @@
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)ufs_vnops.c 7.7 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.63 (Berkeley) %G%

  */
 
 #include "param.h"
 #include "systm.h"
  */
 
 #include "param.h"
 #include "systm.h"

-#include "user.h"
+#include "namei.h"
+#include "resourcevar.h"

 #include "kernel.h"
 #include "file.h"
 #include "stat.h"
 #include "buf.h"
 #include "proc.h"
 #include "kernel.h"
 #include "file.h"
 #include "stat.h"
 #include "buf.h"
 #include "proc.h"

-#include "uio.h"
-#include "socket.h"
-#include "socketvar.h"

 #include "conf.h"
 #include "mount.h"
 #include "vnode.h"
 #include "conf.h"
 #include "mount.h"
 #include "vnode.h"

-#include "../ufs/inode.h"
-#include "../ufs/fs.h"
-#include "../ufs/quota.h"
+#include "specdev.h"
+#include "fifo.h"
+#include "malloc.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_lock(),
-       ufs_unlock(),
-       ufs_bmap(),
-       ufs_strategy();
-
-struct vnodeops ufs_vnodeops = {
-       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_lock,
-       ufs_unlock,
-       ufs_bmap,
-       ufs_strategy,
-};
-
-enum vtype iftovt_tab[8] = {
-       VNON, VCHR, VDIR, VBLK, VREG, VLNK, VSOCK, VBAD,
-};
-int    vttoif_tab[8] = {
-       0, IFREG, IFDIR, IFBLK, IFCHR, IFLNK, IFSOCK, IFMT,
-};
+#include "lockf.h"
+#include "quota.h"
+#include "inode.h"
+#include "dir.h"
+#include "fs.h"

 
 /*
  * Create a regular file
  */
 
 /*
  * Create a regular file
  */

-ufs_create(ndp, vap)
+ufs_create(ndp, vap, p)

        struct nameidata *ndp;
        struct vattr *vap;
        struct nameidata *ndp;
        struct vattr *vap;

+       struct proc *p;

 {
        struct inode *ip;
        int error;
 {
        struct inode *ip;
        int error;


@@ -128,33 +50,35 @@ ufs_create(ndp, vap)
  * Mknod vnode call
  */
 /* ARGSUSED */
  * Mknod vnode call
  */
 /* ARGSUSED */

-ufs_mknod(ndp, vap, cred)
+ufs_mknod(ndp, vap, cred, p)

        struct nameidata *ndp;
        struct ucred *cred;
        struct vattr *vap;
        struct nameidata *ndp;
        struct ucred *cred;
        struct vattr *vap;

+       struct proc *p;

 {
 {

+       register struct vnode *vp;

        struct inode *ip;
        int error;
 
        if (error = maknode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &ip))
                return (error);
        struct inode *ip;
        int error;
 
        if (error = maknode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &ip))
                return (error);

-       if (vap->va_rdev) {
+       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.
                 */
                /*
                 * Want to be able to use this to make badblock
                 * inodes, so don't truncate the dev number.
                 */

-               ITOV(ip)->v_rdev = ip->i_rdev = vap->va_rdev;
-               ip->i_flag |= IACC|IUPD|ICHG;
+               ip->i_rdev = vap->va_rdev;

        }
        }

-       iput(ip);

        /*
         * 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.
         */
        /*
         * 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.
         */

-       remque(ip);
-       ip->i_forw = ip;
-       ip->i_back = ip;
+       vp = ITOV(ip);
+       vput(vp);
+       vp->v_type = VNON;
+       vgone(vp);

        return (0);
 }
 
        return (0);
 }
 


@@ -164,10 +88,11 @@ ufs_mknod(ndp, vap, cred)
  * Nothing to do.
  */
 /* ARGSUSED */
  * Nothing to do.
  */
 /* ARGSUSED */

-ufs_open(vp, mode, cred)
+ufs_open(vp, mode, cred, p)

        struct vnode *vp;
        int mode;
        struct ucred *cred;
        struct vnode *vp;
        int mode;
        struct ucred *cred;

+       struct proc *p;

 {
 
        return (0);
 {
 
        return (0);


@@ -179,32 +104,80 @@ ufs_open(vp, mode, cred)
  * Update the times on the inode.
  */
 /* ARGSUSED */
  * Update the times on the inode.
  */
 /* ARGSUSED */

-ufs_close(vp, fflag, cred)
+ufs_close(vp, fflag, cred, p)

        struct vnode *vp;
        int fflag;
        struct ucred *cred;
        struct vnode *vp;
        int fflag;
        struct ucred *cred;

+       struct proc *p;

 {
        register struct inode *ip = VTOI(vp);
 
 {
        register struct inode *ip = VTOI(vp);
 

-       if (vp->v_count > 1 && !(ip->i_flag & ILOCKED))
+       if (vp->v_usecount > 1 && !(ip->i_flag & ILOCKED))

                ITIMES(ip, &time, &time);
        return (0);
 }
 
                ITIMES(ip, &time, &time);
        return (0);
 }
 

-ufs_access(vp, mode, cred)
+/*
+ * 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.
+ */
+ufs_access(vp, mode, cred, p)

        struct vnode *vp;
        struct vnode *vp;

-       int mode;
+       register int mode;

        struct ucred *cred;
        struct ucred *cred;

+       struct proc *p;

 {
 {

+       register struct inode *ip = VTOI(vp);
+       register gid_t *gp;
+       int i, error;

 
 

-       return (iaccess(VTOI(vp), mode, cred));
+#ifdef DIAGNOSTIC
+       if (!VOP_ISLOCKED(vp)) {
+               vprint("ufs_access: not locked", vp);
+               panic("ufs_access: not locked");
+       }
+#endif
+#ifdef QUOTA
+       if (mode & VWRITE) {
+               switch (vp->v_type) {
+               case VREG: case VDIR: case VLNK:
+                       if (error = getinoquota(ip))
+                               return (error);
+               }
+       }
+#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:
+               ;
+       }
+       if ((ip->i_mode & mode) != 0)
+               return (0);
+       return (EACCES);

 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */

-ufs_getattr(vp, vap, cred)
+ufs_getattr(vp, vap, cred, p)

        struct vnode *vp;
        register struct vattr *vap;
        struct ucred *cred;
        struct vnode *vp;
        register struct vattr *vap;
        struct ucred *cred;

+       struct proc *p;

 {
        register struct inode *ip = VTOI(vp);
 
 {
        register struct inode *ip = VTOI(vp);
 


@@ -219,11 +192,20 @@ ufs_getattr(vp, vap, cred)
        vap->va_uid = ip->i_uid;
        vap->va_gid = ip->i_gid;
        vap->va_rdev = (dev_t)ip->i_rdev;
        vap->va_uid = ip->i_uid;
        vap->va_gid = ip->i_gid;
        vap->va_rdev = (dev_t)ip->i_rdev;

-       vap->va_size = ip->i_ic.ic_size.val[0];
-       vap->va_size1 = ip->i_ic.ic_size.val[1];
+#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_sec = ip->i_atime;

+       vap->va_atime.tv_usec = 0;

        vap->va_mtime.tv_sec = ip->i_mtime;
        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_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;
        /* this doesn't belong here */
        if (vp->v_type == VBLK)
                vap->va_blocksize = BLKDEV_IOSIZE;


@@ -231,12 +213,8 @@ ufs_getattr(vp, vap, cred)
                vap->va_blocksize = MAXBSIZE;
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;
                vap->va_blocksize = MAXBSIZE;
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;

-       /*
-        * XXX THIS IS NOT CORRECT!!, but be sure to change vn_stat()
-        * if you change it.
-        */
-       vap->va_bytes = ip->i_blocks;
-       vap->va_bytes1 = -1;
+       vap->va_bytes = dbtob(ip->i_blocks);
+       vap->va_bytes_rsv = 0;

        vap->va_type = vp->v_type;
        return (0);
 }
        vap->va_type = vp->v_type;
        return (0);
 }


@@ -244,10 +222,11 @@ ufs_getattr(vp, vap, cred)
 /*
  * Set attribute vnode op. called from several syscalls
  */
 /*
  * Set attribute vnode op. called from several syscalls
  */

-ufs_setattr(vp, vap, cred)
+ufs_setattr(vp, vap, cred, p)

        register struct vnode *vp;
        register struct vattr *vap;
        register struct ucred *cred;
        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 = VTOI(vp);
        int error = 0;


@@ -258,30 +237,25 @@ ufs_setattr(vp, vap, cred)
        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) ||
        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)) {
+           ((int)vap->va_bytes != VNOVAL) || (vap->va_gen != VNOVAL)) {

                return (EINVAL);
        }
        /*
         * Go through the fields and update iff not VNOVAL.
         */
        if (vap->va_uid != (u_short)VNOVAL || vap->va_gid != (u_short)VNOVAL)
                return (EINVAL);
        }
        /*
         * 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 = chown1(vp, vap->va_uid, vap->va_gid, p))

                        return (error);
        if (vap->va_size != VNOVAL) {
                if (vp->v_type == VDIR)
                        return (EISDIR);
                        return (error);
        if (vap->va_size != VNOVAL) {
                if (vp->v_type == VDIR)
                        return (EISDIR);

-               if (error = iaccess(ip, IWRITE, cred))
-                       return (error);
-               if (error = itrunc(ip, vap->va_size))
+               if (error = itrunc(ip, vap->va_size, 0)) /* XXX IO_SYNC? */

                        return (error);
        }
                        return (error);
        }

-       /*
-        * Check whether the following attributes can be changed.
-        */
-       if (cred->cr_uid != ip->i_uid &&
-           (error = suser(cred, &u.u_acflag)))
-               return (error);

        if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) {
        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)
                if (vap->va_atime.tv_sec != VNOVAL)
                        ip->i_flag |= IACC;
                if (vap->va_mtime.tv_sec != VNOVAL)


@@ -291,7 +265,19 @@ ufs_setattr(vp, vap, cred)
                        return (error);
        }
        if (vap->va_mode != (u_short)VNOVAL)
                        return (error);
        }
        if (vap->va_mode != (u_short)VNOVAL)

-               error = chmod1(vp, (int)vap->va_mode, cred);
+               error = chmod1(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;
+       }

        return (error);
 }
 
        return (error);
 }
 


@@ -299,24 +285,29 @@ ufs_setattr(vp, vap, cred)
  * Change the mode on a file.
  * Inode must be locked before calling.
  */
  * Change the mode on a file.
  * Inode must be locked before calling.
  */

-chmod1(vp, mode, cred)
+chmod1(vp, mode, p)

        register struct vnode *vp;
        register int mode;
        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);
        register struct inode *ip = VTOI(vp);

+       int error;

 
 

-       ip->i_mode &= ~07777;
+       if (cred->cr_uid != ip->i_uid &&
+           (error = suser(cred, &p->p_acflag)))
+               return (error);

        if (cred->cr_uid) {
        if (cred->cr_uid) {

-               if (vp->v_type != VDIR)
-                       mode &= ~ISVTX;
-               if (!groupmember(ip->i_gid, cred))
-                       mode &= ~ISGID;
+               if (vp->v_type != VDIR && (mode & ISVTX))
+                       return (EFTYPE);
+               if (!groupmember(ip->i_gid, cred) && (mode & ISGID))
+                       return (EPERM);

        }
        }

+       ip->i_mode &= ~07777;

        ip->i_mode |= mode & 07777;
        ip->i_flag |= ICHG;
        if ((vp->v_flag & VTEXT) && (ip->i_mode & ISVTX) == 0)
        ip->i_mode |= mode & 07777;
        ip->i_flag |= ICHG;
        if ((vp->v_flag & VTEXT) && (ip->i_mode & ISVTX) == 0)

-               xrele(vp);
+               (void) vnode_pager_uncache(vp);

        return (0);
 }
 
        return (0);
 }
 


@@ -324,17 +315,21 @@ chmod1(vp, mode, cred)
  * Perform chown operation on inode ip;
  * inode must be locked prior to call.
  */
  * Perform chown operation on inode ip;
  * inode must be locked prior to call.
  */

-chown1(vp, uid, gid, cred)
+chown1(vp, uid, gid, p)

        register struct vnode *vp;
        uid_t uid;
        gid_t gid;
        register struct vnode *vp;
        uid_t uid;
        gid_t gid;

-       struct ucred *cred;
+       struct proc *p;

 {
        register struct inode *ip = VTOI(vp);
 {
        register struct inode *ip = VTOI(vp);

+       register struct ucred *cred = p->p_ucred;
+       uid_t ouid;
+       gid_t ogid;
+       int error = 0;

 #ifdef QUOTA
 #ifdef QUOTA

-       register long change;
+       register int i;
+       long change;

 #endif
 #endif

-       int error;

 
        if (uid == (u_short)VNOVAL)
                uid = ip->i_uid;
 
        if (uid == (u_short)VNOVAL)
                uid = ip->i_uid;


@@ -347,54 +342,265 @@ chown1(vp, uid, gid, cred)
         */
        if ((cred->cr_uid != ip->i_uid || uid != ip->i_uid ||
            !groupmember((gid_t)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);
                return (error);

+       ouid = ip->i_uid;
+       ogid = ip->i_gid;

 #ifdef QUOTA
 #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;
 #endif
        ip->i_uid = uid;
        ip->i_gid = gid;

-       ip->i_flag |= ICHG;
-       if (cred->cr_ruid != 0)
-               ip->i_mode &= ~(ISUID|ISGID);

 #ifdef QUOTA
 #ifdef QUOTA

-       ip->i_dquot = inoquota(ip);
-       (void) chkdq(ip, change, 1);
-       (void) chkiq(ip->i_dev, (struct inode *)NULL, (uid_t)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);
        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;
+
+#ifdef DIAGNOSTIC
+       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");
+#endif
+       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;
+{
+       struct proc *p = uio->uio_procp;
+       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;
+
+#ifdef DIAGNOSTIC
+       if (uio->uio_rw != UIO_WRITE)
+               panic("ufs_write mode");

 #endif
 #endif

+       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 && p &&
+           uio->uio_offset + uio->uio_resid >
+             p->p_rlimit[RLIMIT_FSIZE].rlim_cur) {
+               psignal(p, 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 */
 }
 
 /* ARGSUSED */

-ufs_ioctl(vp, com, data, fflag, cred)
+ufs_ioctl(vp, com, data, fflag, cred, p)

        struct vnode *vp;
        int com;
        caddr_t data;
        int fflag;
        struct ucred *cred;
        struct vnode *vp;
        int com;
        caddr_t data;
        int fflag;
        struct ucred *cred;

+       struct proc *p;

 {
 
 {
 

-       printf("ufs_ioctl called with type %d\n", vp->v_type);

        return (ENOTTY);
 }
 
 /* ARGSUSED */
        return (ENOTTY);
 }
 
 /* ARGSUSED */

-ufs_select(vp, which, cred)
+ufs_select(vp, which, fflags, cred, p)

        struct vnode *vp;
        struct vnode *vp;

-       int which;
+       int which, fflags;

        struct ucred *cred;
        struct ucred *cred;

+       struct proc *p;

 {
 
 {
 

-       printf("ufs_select called with type %d\n", vp->v_type);
-       return (1);             /* XXX */
+       /*
+        * We should really check to see if I/O is possible.
+        */
+       return (1);

 }
 
 /*
 }
 
 /*


@@ -403,10 +609,11 @@ ufs_select(vp, which, cred)
  * NB Currently unsupported.
  */
 /* ARGSUSED */
  * NB Currently unsupported.
  */
 /* ARGSUSED */

-ufs_mmap(vp, fflags, cred)
+ufs_mmap(vp, fflags, cred, p)

        struct vnode *vp;
        int fflags;
        struct ucred *cred;
        struct vnode *vp;
        int fflags;
        struct ucred *cred;

+       struct proc *p;

 {
 
        return (EINVAL);
 {
 
        return (EINVAL);


@@ -416,20 +623,19 @@ ufs_mmap(vp, fflags, cred)
  * Synch an open file.
  */
 /* ARGSUSED */
  * Synch an open file.
  */
 /* ARGSUSED */

-ufs_fsync(vp, fflags, cred)
+ufs_fsync(vp, fflags, cred, waitfor, p)

        struct vnode *vp;
        int fflags;
        struct ucred *cred;
        struct vnode *vp;
        int fflags;
        struct ucred *cred;

+       int waitfor;
+       struct proc *p;

 {
 {

-       register struct inode *ip = VTOI(vp);
-       int error;
+       struct inode *ip = VTOI(vp);

 
 

-       ILOCK(ip);
-       if (fflags&FWRITE)
+       if (fflags & FWRITE)

                ip->i_flag |= ICHG;
                ip->i_flag |= ICHG;

-       error = syncip(ip);
-       IUNLOCK(ip);
-       return (error);
+       vflushbuf(vp, waitfor == MNT_WAIT ? B_SYNC : 0);
+       return (iupdat(ip, &time, &time, waitfor == MNT_WAIT));

 }
 
 /*
 }
 
 /*


@@ -452,8 +658,9 @@ ufs_seek(vp, oldoff, newoff, cred)
  * Hard to avoid races here, especially
  * in unlinking directories.
  */
  * Hard to avoid races here, especially
  * in unlinking directories.
  */

-ufs_remove(ndp)
+ufs_remove(ndp, p)

        struct nameidata *ndp;
        struct nameidata *ndp;

+       struct proc *p;

 {
        register struct inode *ip, *dp;
        int error;
 {
        register struct inode *ip, *dp;
        int error;


@@ -476,27 +683,33 @@ ufs_remove(ndp)
 /*
  * link vnode call
  */
 /*
  * link vnode call
  */

-ufs_link(vp, ndp)
+ufs_link(vp, ndp, p)

        register struct vnode *vp;
        register struct nameidata *ndp;
        register struct vnode *vp;
        register struct nameidata *ndp;

+       struct proc *p;

 {
        register struct inode *ip = VTOI(vp);
        int error;
 
 {
        register struct inode *ip = VTOI(vp);
        int error;
 

+#ifdef DIANOSTIC
+       if ((ndp->ni_nameiop & HASBUF) == 0)
+               panic("ufs_link: no name");
+#endif
+       if ((unsigned short)ip->i_nlink >= LINK_MAX) {
+               free(ndp->ni_pnbuf, M_NAMEI);
+               return (EMLINK);
+       }

        if (ndp->ni_dvp != vp)
                ILOCK(ip);
        if (ndp->ni_dvp != vp)
                ILOCK(ip);

-       if (ip->i_nlink == LINK_MAX - 1) {
-               error = EMLINK;
-               goto out;
-       }

        ip->i_nlink++;
        ip->i_flag |= ICHG;
        error = iupdat(ip, &time, &time, 1);
        if (!error)
                error = direnter(ip, ndp);
        ip->i_nlink++;
        ip->i_flag |= ICHG;
        error = iupdat(ip, &time, &time, 1);
        if (!error)
                error = direnter(ip, ndp);

-out:

        if (ndp->ni_dvp != vp)
                IUNLOCK(ip);
        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;
        if (error) {
                ip->i_nlink--;
                ip->i_flag |= ICHG;


@@ -528,28 +741,52 @@ out:
  *    is different from the source, patch the ".." entry in the
  *    directory.
  */
  *    is different from the source, patch the ".." entry in the
  *    directory.
  */

-ufs_rename(fndp, tndp)
+ufs_rename(fndp, tndp, p)

        register struct nameidata *fndp, *tndp;
        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;
 
 {
        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);
        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) {
        ILOCK(ip);
        if ((ip->i_mode&IFMT) == IFDIR) {

-               register struct direct *d = &fndp->ni_dent;
-

                /*
                 * Avoid ".", "..", and aliases of "." for obvious reasons.
                 */
                /*
                 * 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)) {
-                       IUNLOCK(ip);
-                       ufs_abortop(fndp);
-                       ufs_abortop(tndp);
+               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;
                        return (EINVAL);
                }
                ip->i_flag |= IRENAME;


@@ -590,21 +827,23 @@ ufs_rename(fndp, tndp)
        if (oldparent != dp->i_number)
                newparent = dp->i_number;
        if (doingdirectory && newparent) {
        if (oldparent != dp->i_number)
                newparent = dp->i_number;
        if (doingdirectory && newparent) {

-               if (error = iaccess(ip, IWRITE, tndp->ni_cred))
+               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;
                        goto bad;

-               tndp->ni_nameiop = RENAME | LOCKPARENT | LOCKLEAF | NOCACHE;
-               do {
-                       dp = VTOI(tndp->ni_dvp);
-                       if (xp != NULL)
-                               vput(ITOV(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)
+                       iput(xp);
+               if (error = checkpath(ip, dp, tndp->ni_cred))
+                       goto out;
+               if ((tndp->ni_nameiop & SAVESTART) == 0)
+                       panic("ufs_rename: lost to startdir");
+               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
        }
        /*
         * 2) If target doesn't exist, link the target


@@ -622,12 +861,24 @@ ufs_rename(fndp, tndp)
                 * parent we don't fool with the link count.
                 */
                if (doingdirectory && newparent) {
                 * parent we don't fool with the link count.
                 */
                if (doingdirectory && newparent) {

+                       if ((unsigned short)dp->i_nlink >= LINK_MAX) {
+                               error = EMLINK;
+                               goto bad;
+                       }

                        dp->i_nlink++;
                        dp->i_flag |= ICHG;
                        dp->i_nlink++;
                        dp->i_flag |= ICHG;

-                       error = iupdat(dp, &time, &time, 1);
+                       if (error = iupdat(dp, &time, &time, 1))
+                               goto bad;

                }
                }

-               if (error = direnter(ip, tndp))
-                       goto out;
+               if (error = direnter(ip, tndp)) {
+                       if (doingdirectory && newparent) {
+                               dp->i_nlink--;
+                               dp->i_flag |= ICHG;
+                               (void) iupdat(dp, &time, &time, 1);
+                       }
+                       goto bad;
+               }
+               iput(dp);

        } else {
                if (xp->i_dev != dp->i_dev || xp->i_dev != ip->i_dev)
                        panic("rename: EXDEV");
        } else {
                if (xp->i_dev != dp->i_dev || xp->i_dev != ip->i_dev)
                        panic("rename: EXDEV");


@@ -649,11 +900,9 @@ ufs_rename(fndp, tndp)
                        goto bad;
                }
                /*
                        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 ((xp->i_mode&IFMT) == IFDIR) {
                        if (!dirempty(xp, dp->i_number, tndp->ni_cred) || 


@@ -672,6 +921,16 @@ ufs_rename(fndp, tndp)
                }
                if (error = dirrewrite(dp, ip, tndp))
                        goto bad;
                }
                if (error = dirrewrite(dp, ip, tndp))
                        goto bad;

+               /*
+                * If the target directory is in the same
+                * directory as the source directory,
+                * decrement the link count on the parent
+                * of the target directory.
+                */
+                if (doingdirectory && !newparent) {
+                       dp->i_nlink--;
+                       dp->i_flag |= ICHG;
+               }

                vput(ITOV(dp));
                /*
                 * Adjust the link count of the target to
                vput(ITOV(dp));
                /*
                 * Adjust the link count of the target to


@@ -687,24 +946,33 @@ ufs_rename(fndp, tndp)
                if (doingdirectory) {
                        if (--xp->i_nlink != 0)
                                panic("rename: linked directory");
                if (doingdirectory) {
                        if (--xp->i_nlink != 0)
                                panic("rename: linked directory");

-                       error = itrunc(xp, (u_long)0);
+                       error = itrunc(xp, (u_long)0, IO_SYNC);

                }
                xp->i_flag |= ICHG;
                }
                xp->i_flag |= ICHG;

-               vput(ITOV(xp));
+               iput(xp);

                xp = NULL;
        }
 
        /*
         * 3) Unlink the source.
         */
                xp = NULL;
        }
 
        /*
         * 3) Unlink the source.
         */

-       fndp->ni_nameiop = DELETE | LOCKPARENT | LOCKLEAF;
-       (void)namei(fndp);
+unlinkit:
+       fndp->ni_nameiop &= ~MODMASK;
+       fndp->ni_nameiop |= LOCKPARENT | LOCKLEAF;
+       if ((fndp->ni_nameiop & SAVESTART) == 0)
+               panic("ufs_rename: lost from startdir");
+       (void) lookup(fndp, p);

        if (fndp->ni_vp != NULL) {
                xp = VTOI(fndp->ni_vp);
                dp = VTOI(fndp->ni_dvp);
        } else {
        if (fndp->ni_vp != NULL) {
                xp = VTOI(fndp->ni_vp);
                dp = VTOI(fndp->ni_dvp);
        } else {

-               xp = NULL;
-               dp = NULL;
+               /*
+                * From name has disappeared.
+                */
+               if (doingdirectory)
+                       panic("rename: lost dir entry");
+               vrele(ITOV(ip));
+               return (0);

        }
        /*
         * Ensure that the directory entry still exists and has not
        }
        /*
         * Ensure that the directory entry still exists and has not


@@ -729,21 +997,24 @@ ufs_rename(fndp, tndp)
                if (doingdirectory && newparent) {
                        dp->i_nlink--;
                        dp->i_flag |= ICHG;
                if (doingdirectory && newparent) {
                        dp->i_nlink--;
                        dp->i_flag |= ICHG;

-                       error = rdwri(UIO_READ, xp, (caddr_t)&dirbuf,
+                       error = vn_rdwr(UIO_READ, ITOV(xp), (caddr_t)&dirbuf,

                                sizeof (struct dirtemplate), (off_t)0,
                                sizeof (struct dirtemplate), (off_t)0,

-                               UIO_USERSPACE, tndp->ni_cred, (int *)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] != '.') {
                        if (error == 0) {
                                if (dirbuf.dotdot_namlen != 2 ||
                                    dirbuf.dotdot_name[0] != '.' ||
                                    dirbuf.dotdot_name[1] != '.') {

-                                       printf("rename: mangled dir\n");
+                                       dirbad(xp, 12, "rename: mangled dir");

                                } else {
                                        dirbuf.dotdot_ino = newparent;
                                } else {
                                        dirbuf.dotdot_ino = newparent;

-                                       (void) rdwri(UIO_WRITE, xp,
+                                       (void) vn_rdwr(UIO_WRITE, ITOV(xp),

                                            (caddr_t)&dirbuf,
                                            sizeof (struct dirtemplate),
                                            (caddr_t)&dirbuf,
                                            sizeof (struct dirtemplate),

-                                           (off_t)0, UIO_USERSPACE,
-                                           tndp->ni_cred, (int *)0);
+                                           (off_t)0, UIO_SYSSPACE,
+                                           IO_NODELOCKED|IO_SYNC,
+                                           tndp->ni_cred, (int *)0,
+                                           (struct proc *)0);

                                        cache_purge(ITOV(dp));
                                }
                        }
                                        cache_purge(ITOV(dp));
                                }
                        }


@@ -784,9 +1055,10 @@ struct dirtemplate mastertemplate = {
 /*
  * Mkdir system call
  */
 /*
  * Mkdir system call
  */

-ufs_mkdir(ndp, vap)
+ufs_mkdir(ndp, vap, p)

        struct nameidata *ndp;
        struct vattr *vap;
        struct nameidata *ndp;
        struct vattr *vap;

+       struct proc *p;

 {
        register struct inode *ip, *dp;
        struct inode *tip;
 {
        register struct inode *ip, *dp;
        struct inode *tip;


@@ -795,36 +1067,46 @@ ufs_mkdir(ndp, vap)
        int error;
        int dmode;
 
        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);
        dvp = ndp->ni_dvp;
        dp = VTOI(dvp);

+       if ((unsigned short)dp->i_nlink >= LINK_MAX) {
+               free(ndp->ni_pnbuf, M_NAMEI);
+               iput(dp);
+               return (EMLINK);
+       }

        dmode = vap->va_mode&0777;
        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.

         */
         */

-       error = ialloc(dp, dirpref(dp->i_fs), dmode, &tip);
-       if (error) {
+       if (error = ialloc(dp, dirpref(dp->i_fs), dmode, ndp->ni_cred, &tip)) {
+               free(ndp->ni_pnbuf, M_NAMEI);

                iput(dp);
                return (error);
        }
        ip = tip;
                iput(dp);
                return (error);
        }
        ip = tip;

+       ip->i_uid = ndp->ni_cred->cr_uid;
+       ip->i_gid = dp->i_gid;

 #ifdef QUOTA
 #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);
+               ifree(ip, ip->i_number, dmode);
+               iput(ip);
+               iput(dp);
+               return (error);
+       }

 #endif
        ip->i_flag |= IACC|IUPD|ICHG;
        ip->i_mode = dmode;
        ITOV(ip)->v_type = VDIR;        /* Rest init'd in iget() */
        ip->i_nlink = 2;
 #endif
        ip->i_flag |= IACC|IUPD|ICHG;
        ip->i_mode = dmode;
        ITOV(ip)->v_type = VDIR;        /* Rest init'd in iget() */
        ip->i_nlink = 2;

-       ip->i_uid = ndp->ni_cred->cr_uid;
-       ip->i_gid = dp->i_gid;
-#ifdef QUOTA
-       ip->i_dquot = inoquota(ip);
-#endif

        error = iupdat(ip, &time, &time, 1);
 
        /*
        error = iupdat(ip, &time, &time, 1);
 
        /*


@@ -835,7 +1117,8 @@ ufs_mkdir(ndp, vap)
         */
        dp->i_nlink++;
        dp->i_flag |= ICHG;
         */
        dp->i_nlink++;
        dp->i_flag |= ICHG;

-       error = iupdat(dp, &time, &time, 1);
+       if (error = iupdat(dp, &time, &time, 1))
+               goto bad;

 
        /*
         * Initialize directory with "."
 
        /*
         * Initialize directory with "."


@@ -844,33 +1127,28 @@ ufs_mkdir(ndp, vap)
        dirtemplate = mastertemplate;
        dirtemplate.dot_ino = ip->i_number;
        dirtemplate.dotdot_ino = dp->i_number;
        dirtemplate = mastertemplate;
        dirtemplate.dot_ino = ip->i_number;
        dirtemplate.dotdot_ino = dp->i_number;

-       error = rdwri(UIO_WRITE, ip, (caddr_t)&dirtemplate,
-               sizeof (dirtemplate), (off_t)0, UIO_SYSSPACE,
-               ndp->ni_cred, (int *)0);
+       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;
        }
        if (error) {
                dp->i_nlink--;
                dp->i_flag |= ICHG;
                goto bad;
        }

-       if (DIRBLKSIZ > dp->i_fs->fs_fsize)
+       if (DIRBLKSIZ > dp->i_fs->fs_fsize) {

                panic("mkdir: blksize");     /* XXX - should grow w/balloc() */
                panic("mkdir: blksize");     /* XXX - should grow w/balloc() */

-       else
+       } else {

                ip->i_size = DIRBLKSIZ;
                ip->i_size = DIRBLKSIZ;

+               ip->i_flag |= ICHG;
+       }

        /*
         * Directory all set up, now
         * install the entry for it in
         * the parent directory.
         */
        /*
         * Directory all set up, now
         * install the entry for it in
         * the parent directory.
         */

-       error = direnter(ip, ndp);
-       dp = NULL;
-       if (error) {
-               ndp->ni_nameiop = LOOKUP | NOCACHE;
-               error = namei(ndp);
-               if (!error) {
-                       dp = VTOI(ndp->ni_vp);
-                       dp->i_nlink--;
-                       dp->i_flag |= ICHG;
-               }
+       if (error = direnter(ip, ndp)) {
+               dp->i_nlink--;
+               dp->i_flag |= ICHG;

        }
 bad:
        /*
        }
 bad:
        /*


@@ -881,18 +1159,20 @@ bad:
        if (error) {
                ip->i_nlink = 0;
                ip->i_flag |= ICHG;
        if (error) {
                ip->i_nlink = 0;
                ip->i_flag |= ICHG;

-       }
-       iput(ip);
-       if (dp)
-               iput(dp);
+               iput(ip);
+       } else
+               ndp->ni_vp = ITOV(ip);
+       FREE(ndp->ni_pnbuf, M_NAMEI);
+       iput(dp);

        return (error);
 }
 
 /*
  * Rmdir system call.
  */
        return (error);
 }
 
 /*
  * Rmdir system call.
  */

-ufs_rmdir(ndp)
+ufs_rmdir(ndp, p)

        register struct nameidata *ndp;
        register struct nameidata *ndp;

+       struct proc *p;

 {
        register struct inode *ip, *dp;
        int error = 0;
 {
        register struct inode *ip, *dp;
        int error = 0;


@@ -942,7 +1222,7 @@ ufs_rmdir(ndp)
         * worry about them later.
         */
        ip->i_nlink -= 2;
         * worry about them later.
         */
        ip->i_nlink -= 2;

-       error = itrunc(ip, (u_long)0);
+       error = itrunc(ip, (u_long)0, IO_SYNC);

        cache_purge(ITOV(ip));
 out:
        if (ndp->ni_dvp)
        cache_purge(ITOV(ip));
 out:
        if (ndp->ni_dvp)


@@ -954,10 +1234,11 @@ out:
 /*
  * symlink -- make a symbolic link
  */
 /*
  * symlink -- make a symbolic link
  */

-ufs_symlink(ndp, vap, target)
+ufs_symlink(ndp, vap, target, p)

        struct nameidata *ndp;
        struct vattr *vap;
        char *target;
        struct nameidata *ndp;
        struct vattr *vap;
        char *target;

+       struct proc *p;

 {
        struct inode *ip;
        int error;
 {
        struct inode *ip;
        int error;


@@ -965,8 +1246,9 @@ ufs_symlink(ndp, vap, target)
        error = maknode(IFLNK | vap->va_mode, ndp, &ip);
        if (error)
                return (error);
        error = maknode(IFLNK | vap->va_mode, ndp, &ip);
        if (error)
                return (error);

-       error = rdwri(UIO_WRITE, ip, target, strlen(target), (off_t)0,
-               UIO_SYSSPACE, ndp->ni_cred, (int *)0);
+       error = vn_rdwr(UIO_WRITE, ITOV(ip), target, strlen(target), (off_t)0,
+               UIO_SYSSPACE, IO_NODELOCKED, ndp->ni_cred, (int *)0,
+               (struct proc *)0);

        iput(ip);
        return (error);
 }
        iput(ip);
        return (error);
 }


@@ -974,29 +1256,27 @@ ufs_symlink(ndp, vap, target)
 /*
  * Vnode op for read and write
  */
 /*
  * Vnode op for read and write
  */

-ufs_readdir(vp, uio, offp, cred)
+ufs_readdir(vp, uio, cred, eofflagp)

        struct vnode *vp;
        register struct uio *uio;
        struct vnode *vp;
        register struct uio *uio;

-       off_t *offp;

        struct ucred *cred;
        struct ucred *cred;

+       int *eofflagp;

 {
 {

-       register struct inode *ip = VTOI(vp);
-       int count, error;
+       int count, lost, error;

 
 

-       ILOCK(ip);
-       uio->uio_offset = *offp;

        count = uio->uio_resid;
        count &= ~(DIRBLKSIZ - 1);
        count = uio->uio_resid;
        count &= ~(DIRBLKSIZ - 1);

-       if (vp->v_type != VDIR || uio->uio_iovcnt != 1 ||
-           (count < DIRBLKSIZ) || (uio->uio_offset & (DIRBLKSIZ -1))) {
-               IUNLOCK(ip);
+       lost = uio->uio_resid - count;
+       if (count < DIRBLKSIZ || (uio->uio_offset & (DIRBLKSIZ -1)))

                return (EINVAL);
                return (EINVAL);

-       }

        uio->uio_resid = count;
        uio->uio_iov->iov_len = count;
        uio->uio_resid = count;
        uio->uio_iov->iov_len = count;

-       error = readip(ip, uio, cred);
-       *offp += count - uio->uio_resid;
-       IUNLOCK(ip);
+       error = ufs_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 (error);
 }
 


@@ -1009,33 +1289,26 @@ ufs_readlink(vp, uiop, cred)
        struct ucred *cred;
 {
 
        struct ucred *cred;
 {
 

-       return (readip(VTOI(vp), uiop, cred));
+       return (ufs_read(vp, uiop, 0, cred));

 }
 
 /*
  * Ufs abort op, called after namei() when a CREATE/DELETE isn't actually
 }
 
 /*
  * Ufs abort op, called after namei() when a CREATE/DELETE isn't actually

- * done. Iff ni_vp/ni_dvp not null and locked, unlock.
+ * done. If a buffer has been saved in anticipation of a CREATE, delete it.

  */
  */

+/* ARGSUSED */

 ufs_abortop(ndp)
 ufs_abortop(ndp)

-       register struct nameidata *ndp;
+       struct nameidata *ndp;

 {
 {

-       register struct inode *ip;

 
 

-       if (ndp->ni_vp) {
-               ip = VTOI(ndp->ni_vp);
-               if (ip->i_flag & ILOCKED)
-                       IUNLOCK(ip);
-               vrele(ndp->ni_vp);
-       }
-       if (ndp->ni_dvp) {
-               ip = VTOI(ndp->ni_dvp);
-               if (ip->i_flag & ILOCKED)
-                       IUNLOCK(ip);
-               vrele(ndp->ni_dvp);
-       }
-       return;
+       if ((ndp->ni_nameiop & (HASBUF | SAVESTART)) == HASBUF)
+               FREE(ndp->ni_pnbuf, M_NAMEI);
+       return (0);

 }
 
 }
 

+/*
+ * Lock an inode.
+ */

 ufs_lock(vp)
        struct vnode *vp;
 {
 ufs_lock(vp)
        struct vnode *vp;
 {


@@ -1045,6 +1318,9 @@ ufs_lock(vp)
        return (0);
 }
 
        return (0);
 }
 

+/*
+ * Unlock an inode.
+ */

 ufs_unlock(vp)
        struct vnode *vp;
 {
 ufs_unlock(vp)
        struct vnode *vp;
 {


@@ -1056,6 +1332,18 @@ ufs_unlock(vp)
        return (0);
 }
 
        return (0);
 }
 

+/*
+ * Check for a locked inode.
+ */
+ufs_islocked(vp)
+       struct vnode *vp;
+{
+
+       if (VTOI(vp)->i_flag & ILOCKED)
+               return (1);
+       return (0);
+}
+

 /*
  * Get access to bmap
  */
 /*
  * Get access to bmap
  */


@@ -1071,21 +1359,200 @@ ufs_bmap(vp, bn, vpp, bnp)
                *vpp = ip->i_devvp;
        if (bnp == NULL)
                return (0);
                *vpp = ip->i_devvp;
        if (bnp == NULL)
                return (0);

-       return (bmap(ip, bn, bnp, (daddr_t *)0, (int *)0));
+       return (bmap(ip, bn, bnp));

 }
 
 /*
 }
 
 /*

- * Just call the device strategy routine
+ * Calculate the logical to physical mapping if not done already,
+ * then call the device strategy routine.

  */
  */

+int checkoverlap = 0;
+

 ufs_strategy(bp)
        register struct buf *bp;
 {
 ufs_strategy(bp)
        register struct buf *bp;
 {

-       (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
+       register struct inode *ip = VTOI(bp->b_vp);
+       struct vnode *vp;
+       int error;
+
+       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))
+                       return (error);
+               if ((long)bp->b_blkno == -1)
+                       clrbuf(bp);
+       }
+       if ((long)bp->b_blkno == -1) {
+               biodone(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 */
+       vp = ip->i_devvp;
+       bp->b_dev = vp->v_rdev;
+       (*(vp->v_op->vn_strategy))(bp);

        return (0);
 }
 
 /*
        return (0);
 }
 
 /*

- * Make a new file.
+ * Print out the contents of an inode.
+ */
+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;
+       printf("\towner pid %d", ip->i_spare0);
+       if (ip->i_spare1)
+               printf(" waiting pid %d", ip->i_spare1);
+       printf("\n");
+}
+
+/*
+ * Read wrapper for special devices.
+ */
+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.
+ */
+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.
+ */
+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
+ */
+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.
+ */
+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 */
+
+/*
+ * Allocate a new inode.

  */
 maknode(mode, ndp, ipp)
        int mode;
  */
 maknode(mode, ndp, ipp)
        int mode;


@@ -1098,50 +1565,273 @@ maknode(mode, ndp, ipp)
        ino_t ipref;
        int error;
 
        ino_t ipref;
        int error;
 

+#ifdef DIANOSTIC
+       if ((ndp->ni_nameiop & HASBUF) == 0)
+               panic("maknode: no name");
+#endif

        *ipp = 0;
        *ipp = 0;

+       if ((mode & IFMT) == 0)
+               mode |= IFREG;

        if ((mode & IFMT) == IFDIR)
                ipref = dirpref(pdir->i_fs);
        else
                ipref = pdir->i_number;
        if ((mode & IFMT) == IFDIR)
                ipref = dirpref(pdir->i_fs);
        else
                ipref = pdir->i_number;

-       error = ialloc(pdir, ipref, mode, &tip);
-       if (error) {
+       if (error = ialloc(pdir, ipref, mode, ndp->ni_cred, &tip)) {
+               free(ndp->ni_pnbuf, M_NAMEI);

                iput(pdir);
                return (error);
        }
        ip = tip;
                iput(pdir);
                return (error);
        }
        ip = tip;

+       ip->i_uid = ndp->ni_cred->cr_uid;
+       ip->i_gid = pdir->i_gid;

 #ifdef QUOTA
 #ifdef QUOTA

-       if (ip->i_dquot != NODQUOT)
-               panic("maknode: dquot");
+       if ((error = getinoquota(ip)) ||
+           (error = chkiq(ip, 1, ndp->ni_cred, 0))) {
+               free(ndp->ni_pnbuf, M_NAMEI);
+               ifree(ip, ip->i_number, mode);
+               iput(ip);
+               iput(pdir);
+               return (error);
+       }

 #endif
        ip->i_flag |= IACC|IUPD|ICHG;
 #endif
        ip->i_flag |= IACC|IUPD|ICHG;

-       if ((mode & IFMT) == 0)
-               mode |= IFREG;

        ip->i_mode = mode;
        ITOV(ip)->v_type = IFTOVT(mode);        /* Rest init'd in iget() */
        ip->i_nlink = 1;
        ip->i_mode = mode;
        ITOV(ip)->v_type = IFTOVT(mode);        /* Rest init'd in iget() */
        ip->i_nlink = 1;

-       ip->i_uid = ndp->ni_cred->cr_uid;
-       ip->i_gid = pdir->i_gid;

        if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, ndp->ni_cred) &&
            suser(ndp->ni_cred, NULL))
                ip->i_mode &= ~ISGID;
        if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, ndp->ni_cred) &&
            suser(ndp->ni_cred, NULL))
                ip->i_mode &= ~ISGID;

-#ifdef QUOTA
-       ip->i_dquot = inoquota(ip);
-#endif

 
        /*
         * Make sure inode goes to disk before directory entry.
         */
 
        /*
         * Make sure inode goes to disk before directory entry.
         */

-       if ((error = iupdat(ip, &time, &time, 1)) ||
-           (error = direnter(ip, ndp))) {
+       if (error = iupdat(ip, &time, &time, 1))
+               goto bad;
+       if (error = direnter(ip, ndp))
+               goto bad;
+       if ((ndp->ni_nameiop & SAVESTART) == 0)
+               FREE(ndp->ni_pnbuf, M_NAMEI);
+       iput(pdir);
+       *ipp = ip;
+       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);
+       iput(pdir);
+       ip->i_nlink = 0;
+       ip->i_flag |= ICHG;
+       iput(ip);
+       return (error);
+}
+
+/*
+ * Advisory record locking support
+ */
+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:

                /*
                /*

-                * Write error occurred trying to update the inode
-                * or the directory so must deallocate the inode.
+                * Caller is responsible for adding any necessary offset
+                * when SEEK_CUR is used.

                 */
                 */

-               ip->i_nlink = 0;
-               ip->i_flag |= ICHG;
-               iput(ip);
+               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);
                return (error);

+       
+       default:
+               free(lock, M_LOCKF);
+               return (EINVAL);

        }
        }

-       *ipp = ip;
-       return (0);
+       /* NOTREACHED */

 }
 }

+
+/*
+ * Global vfs data structures for ufs
+ */
+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 */
+};
+
+struct vnodeops spec_inodeops = {
+       spec_lookup,            /* lookup */
+       spec_create,            /* create */
+       spec_mknod,             /* 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_mmap,              /* mmap */
+       spec_fsync,             /* fsync */
+       spec_seek,              /* seek */
+       spec_remove,            /* remove */
+       spec_link,              /* link */
+       spec_rename,            /* rename */
+       spec_mkdir,             /* mkdir */
+       spec_rmdir,             /* rmdir */
+       spec_symlink,           /* symlink */
+       spec_readdir,           /* readdir */
+       spec_readlink,          /* readlink */
+       spec_abortop,           /* abortop */
+       ufs_inactive,           /* inactive */
+       ufs_reclaim,            /* reclaim */
+       ufs_lock,               /* lock */
+       ufs_unlock,             /* unlock */
+       spec_bmap,              /* bmap */
+       spec_strategy,          /* strategy */
+       ufs_print,              /* print */
+       ufs_islocked,           /* islocked */
+       spec_advlock,           /* advlock */
+};
+
+#ifdef FIFO
+struct vnodeops fifo_inodeops = {
+       fifo_lookup,            /* lookup */
+       fifo_create,            /* create */
+       fifo_mknod,             /* mknod */
+       fifo_open,              /* open */
+       ufsfifo_close,          /* close */
+       ufs_access,             /* access */
+       ufs_getattr,            /* getattr */
+       ufs_setattr,            /* setattr */
+       ufsfifo_read,           /* read */
+       ufsfifo_write,          /* write */
+       fifo_ioctl,             /* ioctl */
+       fifo_select,            /* select */
+       fifo_mmap,              /* mmap */
+       fifo_fsync,             /* fsync */
+       fifo_seek,              /* seek */
+       fifo_remove,            /* remove */
+       fifo_link,              /* link */
+       fifo_rename,            /* rename */
+       fifo_mkdir,             /* mkdir */
+       fifo_rmdir,             /* rmdir */
+       fifo_symlink,           /* symlink */
+       fifo_readdir,           /* readdir */
+       fifo_readlink,          /* readlink */
+       fifo_abortop,           /* abortop */
+       ufs_inactive,           /* inactive */
+       ufs_reclaim,            /* reclaim */
+       ufs_lock,               /* lock */
+       ufs_unlock,             /* unlock */
+       fifo_bmap,              /* bmap */
+       fifo_strategy,          /* strategy */
+       ufs_print,              /* print */
+       ufs_islocked,           /* islocked */
+       fifo_advlock,           /* advlock */
+};
+#endif /* FIFO */
+
+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,
+};