BSD 4_4 release

[unix-history] / usr / src / sys / ufs / ufs / ufs_vnops.c

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index a7818be..71a395e 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -1,10 +1,36 @@
 /*
 /*

- * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)ufs_vnops.c 7.91 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)ufs_vnops.c 8.1 (Berkeley) 6/11/93

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -19,12 +45,13 @@
 #include <sys/conf.h>
 #include <sys/mount.h>
 #include <sys/vnode.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 <sys/malloc.h>

+#include <sys/dirent.h>

 
 #include <vm/vm.h>
 
 
 #include <vm/vm.h>
 

+#include <miscfs/specfs/specdev.h>
+

 #include <ufs/ufs/lockf.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/lockf.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>


@@ -32,14 +59,10 @@
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
 
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
 

-int ufs_chmod __P((struct vnode *, int, struct ucred *, struct proc *));
-int ufs_chown
+static int ufs_chmod __P((struct vnode *, int, struct ucred *, struct proc *));
+static int ufs_chown

        __P((struct vnode *, uid_t, gid_t, struct ucred *, struct proc *));
 
        __P((struct vnode *, uid_t, gid_t, struct ucred *, struct proc *));
 

-#ifdef _NOQUAD
-#define        SETHIGH(q, h)   (q).val[_QUAD_HIGHWORD] = (h)
-#define        SETLOW(q, l)    (q).val[_QUAD_LOWWORD] = (l)
-#else /* QUAD */

 union _qcvt {
        quad_t qcvt;
        long val[2];
 union _qcvt {
        quad_t qcvt;
        long val[2];


@@ -56,19 +79,24 @@ union _qcvt {
        tmp.val[_QUAD_LOWWORD] = (l); \
        (q) = tmp.qcvt; \
 }
        tmp.val[_QUAD_LOWWORD] = (l); \
        (q) = tmp.qcvt; \
 }

-#endif /* QUAD */

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

-ufs_create (ap)
-       struct vop_create_args *ap;
+ufs_create(ap)
+       struct vop_create_args /* {
+               struct vnode *a_dvp;
+               struct vnode **a_vpp;
+               struct componentname *a_cnp;
+               struct vattr *a_vap;
+       } */ *ap;

 {
        int error;
 
        if (error =
 {
        int error;
 
        if (error =

-           ufs_makeinode(MAKEIMODE(ap->a_vap->va_type, ap->a_vap->va_mode), ap->a_dvp, ap->a_vpp, ap->a_cnp))
+           ufs_makeinode(MAKEIMODE(ap->a_vap->va_type, ap->a_vap->va_mode),
+           ap->a_dvp, ap->a_vpp, ap->a_cnp))

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


@@ -78,33 +106,41 @@ ufs_create (ap)
  */
 /* ARGSUSED */
 int
  */
 /* ARGSUSED */
 int

-ufs_mknod (ap)
-       struct vop_mknod_args *ap;
+ufs_mknod(ap)
+       struct vop_mknod_args /* {
+               struct vnode *a_dvp;
+               struct vnode **a_vpp;
+               struct componentname *a_cnp;
+               struct vattr *a_vap;
+       } */ *ap;

 {
 {

+       register struct vattr *vap = ap->a_vap;
+       register struct vnode **vpp = ap->a_vpp;

        register struct inode *ip;
        int error;
 
        if (error =
        register struct inode *ip;
        int error;
 
        if (error =

-           ufs_makeinode(MAKEIMODE(ap->a_vap->va_type, ap->a_vap->va_mode), ap->a_dvp, ap->a_vpp, ap->a_cnp))
+           ufs_makeinode(MAKEIMODE(vap->va_type, vap->va_mode),
+           ap->a_dvp, vpp, ap->a_cnp))

                return (error);
                return (error);

-       ip = VTOI(*ap->a_vpp);
+       ip = VTOI(*vpp);

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

-       if (ap->a_vap->va_rdev != VNOVAL) {
+       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.
                 */

-               ip->i_rdev = ap->a_vap->va_rdev;
+               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.
         */
        }
        /*
         * 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(*ap->a_vpp);
-       (*ap->a_vpp)->v_type = VNON;
-       vgone(*ap->a_vpp);
-       *ap->a_vpp = 0;
+       vput(*vpp);
+       (*vpp)->v_type = VNON;
+       vgone(*vpp);
+       *vpp = 0;

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


@@ -115,10 +151,21 @@ ufs_mknod (ap)
  */
 /* ARGSUSED */
 int
  */
 /* ARGSUSED */
 int

-ufs_open (ap)
-       struct vop_open_args *ap;
+ufs_open(ap)
+       struct vop_open_args /* {
+               struct vnode *a_vp;
+               int  a_mode;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

 {
 
 {
 

+       /*
+        * Files marked append-only must be opened for appending.
+        */
+       if ((VTOI(ap->a_vp)->i_flags & APPEND) &&
+           (ap->a_mode & (FWRITE | O_APPEND)) == FWRITE)
+               return (EPERM);

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


@@ -129,13 +176,18 @@ ufs_open (ap)
  */
 /* ARGSUSED */
 int
  */
 /* ARGSUSED */
 int

-ufs_close (ap)
-       struct vop_close_args *ap;
+ufs_close(ap)
+       struct vop_close_args /* {
+               struct vnode *a_vp;
+               int  a_fflag;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

 {
 {

-       register struct inode *ip;
+       register struct vnode *vp = ap->a_vp;
+       register struct inode *ip = VTOI(vp);

 
 

-       ip = VTOI(ap->a_vp);
-       if (ap->a_vp->v_usecount > 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);
 }


@@ -146,97 +198,102 @@ ufs_close (ap)
  * super user is granted all permissions.
  */
 int
  * super user is granted all permissions.
  */
 int

-ufs_access (ap)
-       struct vop_access_args *ap;
+ufs_access(ap)
+       struct vop_access_args /* {
+               struct vnode *a_vp;
+               int  a_mode;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

 {
 {

-       USES_VOP_ISLOCKED;
-       register struct inode *ip = VTOI(ap->a_vp);
+       register struct vnode *vp = ap->a_vp;
+       register struct inode *ip = VTOI(vp);
+       register struct ucred *cred = ap->a_cred;
+       mode_t mode = ap->a_mode;

        register gid_t *gp;
        int i, error;
 
 #ifdef DIAGNOSTIC
        register gid_t *gp;
        int i, error;
 
 #ifdef DIAGNOSTIC

-       if (!VOP_ISLOCKED(ap->a_vp)) {
-               vprint("ufs_access: not locked", ap->a_vp);
+       if (!VOP_ISLOCKED(vp)) {
+               vprint("ufs_access: not locked", vp);

                panic("ufs_access: not locked");
        }
 #endif
 #ifdef QUOTA
                panic("ufs_access: not locked");
        }
 #endif
 #ifdef QUOTA

-       if (ap->a_mode & VWRITE) {
-               switch (ap->a_vp->v_type) {
+       if (mode & VWRITE) {
+               switch (vp->v_type) {

                case VREG: case VDIR: case VLNK:
                        if (error = getinoquota(ip))
                                return (error);
                }
        }
 #endif /* QUOTA */
                case VREG: case VDIR: case VLNK:
                        if (error = getinoquota(ip))
                                return (error);
                }
        }
 #endif /* QUOTA */

+       if ((mode & VWRITE) && (ip->i_flags & IMMUTABLE))
+               return (EPERM);

        /*
         * If you're the super-user, you always get access.
         */
        /*
         * If you're the super-user, you always get access.
         */

-       if (ap->a_cred->cr_uid == 0)
+       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.
         */
                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 (ap->a_cred->cr_uid != ip->i_uid) {
-               ap->a_mode >>= 3;
-               gp = ap->a_cred->cr_groups;
-               for (i = 0; i < ap->a_cred->cr_ngroups; i++, gp++)
+       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;
                        if (ip->i_gid == *gp)
                                goto found;

-               ap->a_mode >>= 3;
+               mode >>= 3;

 found:
                ;
        }
 found:
                ;
        }

-       if ((ip->i_mode & ap->a_mode) != 0)
-               return (0);
-       return (EACCES);
+       return ((ip->i_mode & mode) == mode ? 0 : EACCES);

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

-ufs_getattr (ap)
-       struct vop_getattr_args *ap;
+ufs_getattr(ap)
+       struct vop_getattr_args /* {
+               struct vnode *a_vp;
+               struct vattr *a_vap;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

 {
 {

-       register struct inode *ip;
+       register struct vnode *vp = ap->a_vp;
+       register struct inode *ip = VTOI(vp);
+       register struct vattr *vap = ap->a_vap;

 
 

-       ip = VTOI(ap->a_vp);

        ITIMES(ip, &time, &time);
        /*
         * Copy from inode table
         */
        ITIMES(ip, &time, &time);
        /*
         * Copy from inode table
         */

-       ap->a_vap->va_fsid = ip->i_dev;
-       ap->a_vap->va_fileid = ip->i_number;
-       ap->a_vap->va_mode = ip->i_mode & ~IFMT;
-       ap->a_vap->va_nlink = ip->i_nlink;
-       ap->a_vap->va_uid = ip->i_uid;
-       ap->a_vap->va_gid = ip->i_gid;
-       ap->a_vap->va_rdev = (dev_t)ip->i_rdev;
-#ifdef tahoe
-       ap->a_vap->va_size = ip->i_size;
-       ap->a_vap->va_size_rsv = 0;
-#else
-       ap->a_vap->va_qsize = ip->i_din.di_qsize;
-#endif
-       ap->a_vap->va_atime = ip->i_atime;
-       ap->a_vap->va_mtime = ip->i_mtime;
-       ap->a_vap->va_ctime = ip->i_ctime;
-       ap->a_vap->va_flags = ip->i_flags;
-       ap->a_vap->va_gen = ip->i_gen;
+       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;
+       vap->va_size = ip->i_din.di_size;
+       vap->va_atime = ip->i_atime;
+       vap->va_mtime = ip->i_mtime;
+       vap->va_ctime = ip->i_ctime;
+       vap->va_flags = ip->i_flags;
+       vap->va_gen = ip->i_gen;

        /* this doesn't belong here */
        /* this doesn't belong here */

-       if (ap->a_vp->v_type == VBLK)
-               ap->a_vap->va_blocksize = BLKDEV_IOSIZE;
-       else if (ap->a_vp->v_type == VCHR)
-               ap->a_vap->va_blocksize = MAXBSIZE;
+       if (vp->v_type == VBLK)
+               vap->va_blocksize = BLKDEV_IOSIZE;
+       else if (vp->v_type == VCHR)
+               vap->va_blocksize = MAXBSIZE;

        else
        else

-               ap->a_vap->va_blocksize = ap->a_vp->v_mount->mnt_stat.f_iosize;
-       ap->a_vap->va_bytes = dbtob(ip->i_blocks);
-#ifdef _NOQUAD
-       ap->a_vap->va_bytes_rsv = 0;
-#endif
-       ap->a_vap->va_type = ap->a_vp->v_type;
-       ap->a_vap->va_filerev = ip->i_modrev;
+               vap->va_blocksize = vp->v_mount->mnt_stat.f_iosize;
+       vap->va_bytes = dbtob(ip->i_blocks);
+       vap->va_type = vp->v_type;
+       vap->va_filerev = ip->i_modrev;

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


@@ -244,63 +301,85 @@ ufs_getattr (ap)
  * Set attribute vnode op. called from several syscalls
  */
 int
  * Set attribute vnode op. called from several syscalls
  */
 int

-ufs_setattr (ap)
-       struct vop_setattr_args *ap;
+ufs_setattr(ap)
+       struct vop_setattr_args /* {
+               struct vnode *a_vp;
+               struct vattr *a_vap;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

 {
 {

-       USES_VOP_TRUNCATE;
-       USES_VOP_UPDATE;
-       register struct inode *ip;
+       register struct vattr *vap = ap->a_vap;
+       register struct vnode *vp = ap->a_vp;
+       register struct inode *ip = VTOI(vp);
+       register struct ucred *cred = ap->a_cred;
+       register struct proc *p = ap->a_p;
+       struct timeval atimeval, mtimeval;

        int error;
 
        /*
         * Check for unsettable attributes.
         */
        int error;
 
        /*
         * Check for unsettable attributes.
         */

-       if ((ap->a_vap->va_type != VNON) || (ap->a_vap->va_nlink != VNOVAL) ||
-           (ap->a_vap->va_fsid != VNOVAL) || (ap->a_vap->va_fileid != VNOVAL) ||
-           (ap->a_vap->va_blocksize != VNOVAL) || (ap->a_vap->va_rdev != VNOVAL) ||
-           ((int)ap->a_vap->va_bytes != VNOVAL) || (ap->a_vap->va_gen != 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) || (vap->va_gen != VNOVAL)) {

                return (EINVAL);
        }
                return (EINVAL);
        }

+       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) {
+                       if ((ip->i_flags & (SF_IMMUTABLE | SF_APPEND)) &&
+                           securelevel > 0)
+                               return (EPERM);
+                       ip->i_flags = vap->va_flags;
+               } else {
+                       if (ip->i_flags & (SF_IMMUTABLE | SF_APPEND))
+                               return (EPERM);
+                       ip->i_flags &= SF_SETTABLE;
+                       ip->i_flags |= (vap->va_flags & UF_SETTABLE);
+               }
+               ip->i_flag |= ICHG;
+               if (vap->va_flags & (IMMUTABLE | APPEND))
+                       return (0);
+       }
+       if (ip->i_flags & (IMMUTABLE | APPEND))
+               return (EPERM);

        /*
         * Go through the fields and update iff not VNOVAL.
         */
        /*
         * Go through the fields and update iff not VNOVAL.
         */

-       if (ap->a_vap->va_uid != (uid_t)VNOVAL || ap->a_vap->va_gid != (gid_t)VNOVAL)
-               if (error = ufs_chown(ap->a_vp, ap->a_vap->va_uid, ap->a_vap->va_gid, ap->a_cred, ap->a_p))
+       if (vap->va_uid != (uid_t)VNOVAL || vap->va_gid != (gid_t)VNOVAL)
+               if (error = ufs_chown(vp, vap->va_uid, vap->va_gid, cred, p))

                        return (error);
                        return (error);

-       if (ap->a_vap->va_size != VNOVAL) {
-               if (ap->a_vp->v_type == VDIR)
+       if (vap->va_size != VNOVAL) {
+               if (vp->v_type == VDIR)

                        return (EISDIR);
                        return (EISDIR);

-               if (error = VOP_TRUNCATE(ap->a_vp, ap->a_vap->va_size, 0, ap->a_cred))
+               if (error = VOP_TRUNCATE(vp, vap->va_size, 0, cred, p))

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

-       ip = VTOI(ap->a_vp);
-       if (ap->a_vap->va_atime.tv_sec != VNOVAL || ap->a_vap->va_mtime.tv_sec != VNOVAL) {
-               if (ap->a_cred->cr_uid != ip->i_uid &&
-                   (error = suser(ap->a_cred, &ap->a_p->p_acflag)))
+       ip = VTOI(vp);
+       if (vap->va_atime.ts_sec != VNOVAL || vap->va_mtime.ts_sec != VNOVAL) {
+               if (cred->cr_uid != ip->i_uid &&
+                   (error = suser(cred, &p->p_acflag)) &&
+                   ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || 
+                   (error = VOP_ACCESS(vp, VWRITE, cred, p))))

                        return (error);
                        return (error);

-               if (ap->a_vap->va_atime.tv_sec != VNOVAL)
+               if (vap->va_atime.ts_sec != VNOVAL)

                        ip->i_flag |= IACC;
                        ip->i_flag |= IACC;

-               if (ap->a_vap->va_mtime.tv_sec != VNOVAL)
-                       ip->i_flag |= IUPD;
-               ip->i_flag |= ICHG;
-               if (error = VOP_UPDATE(ap->a_vp, &ap->a_vap->va_atime, &ap->a_vap->va_mtime, 1))
+               if (vap->va_mtime.ts_sec != VNOVAL)
+                       ip->i_flag |= IUPD | ICHG;
+               atimeval.tv_sec = vap->va_atime.ts_sec;
+               atimeval.tv_usec = vap->va_atime.ts_nsec / 1000;
+               mtimeval.tv_sec = vap->va_mtime.ts_sec;
+               mtimeval.tv_usec = vap->va_mtime.ts_nsec / 1000;
+               if (error = VOP_UPDATE(vp, &atimeval, &mtimeval, 1))

                        return (error);
        }
        error = 0;
                        return (error);
        }
        error = 0;

-       if (ap->a_vap->va_mode != (mode_t)VNOVAL)
-               error = ufs_chmod(ap->a_vp, (int)ap->a_vap->va_mode, ap->a_cred, ap->a_p);
-       if (ap->a_vap->va_flags != VNOVAL) {
-               if (ap->a_cred->cr_uid != ip->i_uid &&
-                   (error = suser(ap->a_cred, &ap->a_p->p_acflag)))
-                       return (error);
-               if (ap->a_cred->cr_uid == 0) {
-                       ip->i_flags = ap->a_vap->va_flags;
-               } else {
-                       ip->i_flags &= 0xffff0000;
-                       ip->i_flags |= (ap->a_vap->va_flags & 0xffff);
-               }
-               ip->i_flag |= ICHG;
-       }
+       if (vap->va_mode != (mode_t)VNOVAL)
+               error = ufs_chmod(vp, (int)vap->va_mode, cred, p);

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


@@ -444,8 +523,15 @@ good:
 
 /* ARGSUSED */
 int
 
 /* ARGSUSED */
 int

-ufs_ioctl (ap)
-       struct vop_ioctl_args *ap;
+ufs_ioctl(ap)
+       struct vop_ioctl_args /* {
+               struct vnode *a_vp;
+               int  a_command;
+               caddr_t  a_data;
+               int  a_fflag;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

 {
 
        return (ENOTTY);
 {
 
        return (ENOTTY);


@@ -453,8 +539,14 @@ ufs_ioctl (ap)
 
 /* ARGSUSED */
 int
 
 /* ARGSUSED */
 int

-ufs_select (ap)
-       struct vop_select_args *ap;
+ufs_select(ap)
+       struct vop_select_args /* {
+               struct vnode *a_vp;
+               int  a_which;
+               int  a_fflags;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

 {
 
        /*
 {
 
        /*


@@ -470,8 +562,13 @@ ufs_select (ap)
  */
 /* ARGSUSED */
 int
  */
 /* ARGSUSED */
 int

-ufs_mmap (ap)
-       struct vop_mmap_args *ap;
+ufs_mmap(ap)
+       struct vop_mmap_args /* {
+               struct vnode *a_vp;
+               int  a_fflags;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

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


@@ -484,8 +581,13 @@ ufs_mmap (ap)
  */
 /* ARGSUSED */
 int
  */
 /* ARGSUSED */
 int

-ufs_seek (ap)
-       struct vop_seek_args *ap;
+ufs_seek(ap)
+       struct vop_seek_args /* {
+               struct vnode *a_vp;
+               off_t  a_oldoff;
+               off_t  a_newoff;
+               struct ucred *a_cred;
+       } */ *ap;

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


@@ -497,24 +599,34 @@ ufs_seek (ap)
  * in unlinking directories.
  */
 int
  * in unlinking directories.
  */
 int

-ufs_remove (ap)
-       struct vop_remove_args *ap;
+ufs_remove(ap)
+       struct vop_remove_args /* {
+               struct vnode *a_dvp;
+               struct vnode *a_vp;
+               struct componentname *a_cnp;
+       } */ *ap;

 {
 {

-       register struct inode *ip, *dp;
+       register struct inode *ip;
+       register struct vnode *vp = ap->a_vp;
+       register struct vnode *dvp = ap->a_dvp;

        int error;
 
        int error;
 

-       ip = VTOI(ap->a_vp);
-       dp = VTOI(ap->a_dvp);
-       error = ufs_dirremove(ap->a_dvp, ap->a_cnp);
-       if (!error) {
+       ip = VTOI(vp);
+       if ((ip->i_flags & (IMMUTABLE | APPEND)) ||
+           (VTOI(dvp)->i_flags & APPEND)) {
+               error = EPERM;
+               goto out;
+       }
+       if ((error = ufs_dirremove(dvp, ap->a_cnp)) == 0) {

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

-       if (dp == ip)
-               vrele(ITOV(ip));
+out:
+       if (dvp == vp)
+               vrele(vp);

        else
        else

-               ufs_iput(ip);
-       ufs_iput(dp);
+               vput(vp);
+       vput(dvp);

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


@@ -522,37 +634,60 @@ ufs_remove (ap)
  * link vnode call
  */
 int
  * link vnode call
  */
 int

-ufs_link (ap)
-       struct vop_link_args *ap;
+ufs_link(ap)
+       struct vop_link_args /* {
+               struct vnode *a_vp;
+               struct vnode *a_tdvp;
+               struct componentname *a_cnp;
+       } */ *ap;

 {
 {

-       USES_VOP_UPDATE;
+       register struct vnode *vp = ap->a_vp;
+       register struct vnode *tdvp = ap->a_tdvp;
+       register struct componentname *cnp = ap->a_cnp;

        register struct inode *ip;
        register struct inode *ip;

+       struct timeval tv;

        int error;
 
 #ifdef DIAGNOSTIC
        int error;
 
 #ifdef DIAGNOSTIC

-       if ((ap->a_cnp->cn_flags & HASBUF) == 0)
+       if ((cnp->cn_flags & HASBUF) == 0)

                panic("ufs_link: no name");
 #endif
                panic("ufs_link: no name");
 #endif

-       ip = VTOI(ap->a_tdvp);
+       if (vp->v_mount != tdvp->v_mount) {
+               VOP_ABORTOP(vp, cnp);
+               error = EXDEV;
+               goto out2;
+       }
+       if (vp != tdvp && (error = VOP_LOCK(tdvp))) {
+               VOP_ABORTOP(vp, cnp);
+               goto out2;
+       }
+       ip = VTOI(tdvp);

        if ((nlink_t)ip->i_nlink >= LINK_MAX) {
        if ((nlink_t)ip->i_nlink >= LINK_MAX) {

-               free(ap->a_cnp->cn_pnbuf, M_NAMEI);
-               return (EMLINK);
+               VOP_ABORTOP(vp, cnp);
+               error = EMLINK;
+               goto out1;
+       }
+       if (ip->i_flags & (IMMUTABLE | APPEND)) {
+               VOP_ABORTOP(vp, cnp);
+               error = EPERM;
+               goto out1;

        }
        }

-       if (ap->a_vp != ap->a_tdvp)
-               ILOCK(ip);

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

-       error = VOP_UPDATE(ap->a_tdvp, &time, &time, 1);
+       tv = time;
+       error = VOP_UPDATE(tdvp, &tv, &tv, 1);

        if (!error)
        if (!error)

-               error = ufs_direnter(ip, ap->a_vp, ap->a_cnp);
-       if (ap->a_vp != ap->a_tdvp)
-               IUNLOCK(ip);
-       FREE(ap->a_cnp->cn_pnbuf, M_NAMEI);
-       vput(ap->a_vp);
+               error = ufs_direnter(ip, vp, cnp);

        if (error) {
                ip->i_nlink--;
                ip->i_flag |= ICHG;
        }
        if (error) {
                ip->i_nlink--;
                ip->i_flag |= ICHG;
        }

+       FREE(cnp->cn_pnbuf, M_NAMEI);
+out1:
+       if (vp != tdvp)
+               VOP_UNLOCK(tdvp);
+out2:
+       vput(vp);

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


@@ -567,9 +702,6 @@ relookup(dvp, vpp, cnp)
        struct vnode *dvp, **vpp;
        struct componentname *cnp;
 {
        struct vnode *dvp, **vpp;
        struct componentname *cnp;
 {

-       USES_VOP_LOCK;
-       USES_VOP_LOOKUP;
-       USES_VOP_UNLOCK;

        register struct vnode *dp = 0;  /* the directory we are searching */
        struct vnode *tdp;              /* saved dp */
        struct mount *mp;               /* mount table entry */
        register struct vnode *dp = 0;  /* the directory we are searching */
        struct vnode *tdp;              /* saved dp */
        struct mount *mp;               /* mount table entry */


@@ -740,65 +872,115 @@ bad:
  *    directory.
  */
 int
  *    directory.
  */
 int

-ufs_rename (ap)
-       struct vop_rename_args *ap;
+ufs_rename(ap)
+       struct vop_rename_args  /* {
+               struct vnode *a_fdvp;
+               struct vnode *a_fvp;
+               struct componentname *a_fcnp;
+               struct vnode *a_tdvp;
+               struct vnode *a_tvp;
+               struct componentname *a_tcnp;
+       } */ *ap;

 {
 {

-       USES_VOP_ABORTOP;
-       USES_VOP_ACCESS;
-       USES_VOP_LOCK;
-       USES_VOP_TRUNCATE;
-       USES_VOP_UNLOCK;
-       USES_VOP_UPDATE;
+       struct vnode *tvp = ap->a_tvp;
+       register struct vnode *tdvp = ap->a_tdvp;
+       struct vnode *fvp = ap->a_fvp;
+       register struct vnode *fdvp = ap->a_fdvp;
+       register struct componentname *tcnp = ap->a_tcnp;
+       register struct componentname *fcnp = ap->a_fcnp;

        register struct inode *ip, *xp, *dp;
        struct dirtemplate dirbuf;
        register struct inode *ip, *xp, *dp;
        struct dirtemplate dirbuf;

+       struct timeval tv;

        int doingdirectory = 0, oldparent = 0, newparent = 0;
        int error = 0;
        int fdvpneedsrele = 1, tdvpneedsrele = 1;
        int doingdirectory = 0, oldparent = 0, newparent = 0;
        int error = 0;
        int fdvpneedsrele = 1, tdvpneedsrele = 1;

+       u_char namlen;

 
 #ifdef DIAGNOSTIC
 
 #ifdef DIAGNOSTIC

-       if ((ap->a_tcnp->cn_flags & HASBUF) == 0 ||
-           (ap->a_fcnp->cn_flags & HASBUF) == 0)
+       if ((tcnp->cn_flags & HASBUF) == 0 ||
+           (fcnp->cn_flags & HASBUF) == 0)

                panic("ufs_rename: no name");
 #endif
                panic("ufs_rename: no name");
 #endif

-       dp = VTOI(ap->a_fdvp);
-       ip = VTOI(ap->a_fvp);
+       /*
+        * Check for cross-device rename.
+        */
+       if ((fvp->v_mount != tdvp->v_mount) ||
+           (tvp && (fvp->v_mount != tvp->v_mount))) {
+               error = EXDEV;
+abortit:
+               VOP_ABORTOP(tdvp, tcnp); /* XXX, why not in NFS? */
+               if (tdvp == tvp)
+                       vrele(tdvp);
+               else
+                       vput(tdvp);
+               if (tvp)
+                       vput(tvp);
+               VOP_ABORTOP(fdvp, fcnp); /* XXX, why not in NFS? */
+               vrele(fdvp);
+               vrele(fvp);
+               return (error);
+       }
+

        /*
         * Check if just deleting a link name.
         */
        /*
         * Check if just deleting a link name.
         */

-       if (ap->a_fvp == ap->a_tvp) {
-               VOP_ABORTOP(ap->a_tdvp, ap->a_tcnp);
-               vput(ap->a_tdvp);
-               vput(ap->a_tvp);
-               vrele(ap->a_fdvp);
-               if ((ip->i_mode&IFMT) == IFDIR) {
-                       VOP_ABORTOP(ap->a_fdvp, ap->a_fcnp);
-                       vrele(ap->a_fvp);
-                       return (EINVAL);
+       if (tvp && ((VTOI(tvp)->i_flags & (IMMUTABLE | APPEND)) ||
+           (VTOI(tdvp)->i_flags & APPEND))) {
+               error = EPERM;
+               goto abortit;
+       }
+       if (fvp == tvp) {
+               if (fvp->v_type == VDIR) {
+                       error = EINVAL;
+                       goto abortit;

                }
                }

-               doingdirectory = 0;
-               goto unlinkit;
+               VOP_ABORTOP(fdvp, fcnp);
+               vrele(fdvp);
+               vrele(fvp);
+               vput(tdvp);
+               vput(tvp);
+               tcnp->cn_flags &= ~MODMASK;
+               tcnp->cn_flags |= LOCKPARENT | LOCKLEAF;
+               if ((tcnp->cn_flags & SAVESTART) == 0)
+                       panic("ufs_rename: lost from startdir");
+               tcnp->cn_nameiop = DELETE;
+               (void) relookup(tdvp, &tvp, tcnp);
+               return (VOP_REMOVE(tdvp, tvp, tcnp));
+       }
+       if (error = VOP_LOCK(fvp))
+               goto abortit;
+       dp = VTOI(fdvp);
+       ip = VTOI(fvp);
+       if ((ip->i_flags & (IMMUTABLE | APPEND)) || (dp->i_flags & APPEND)) {
+               VOP_UNLOCK(fvp);
+               error = EPERM;
+               goto abortit;

        }
        }

-       ILOCK(ip);
-       if ((ip->i_mode&IFMT) == IFDIR) {
+       if ((ip->i_mode & IFMT) == IFDIR) {

                /*
                 * Avoid ".", "..", and aliases of "." for obvious reasons.
                 */
                /*
                 * Avoid ".", "..", and aliases of "." for obvious reasons.
                 */

-               if ((ap->a_fcnp->cn_namelen == 1 && ap->a_fcnp->cn_nameptr[0] == '.') ||
-                   dp == ip || (ap->a_fcnp->cn_flags&ISDOTDOT) || (ip->i_flag & IRENAME)) {
-                       VOP_ABORTOP(ap->a_tdvp, ap->a_tcnp);
-                       vput(ap->a_tdvp);
-                       if (ap->a_tvp)
-                               vput(ap->a_tvp);
-                       VOP_ABORTOP(ap->a_fdvp, ap->a_fcnp);
-                       vrele(ap->a_fdvp);
-                       vput(ap->a_fvp);
-                       return (EINVAL);
+               if ((fcnp->cn_namelen == 1 && fcnp->cn_nameptr[0] == '.') ||
+                   dp == ip || (fcnp->cn_flags&ISDOTDOT) ||
+                   (ip->i_flag & IRENAME)) {
+                       VOP_UNLOCK(fvp);
+                       error = EINVAL;
+                       goto abortit;

                }
                ip->i_flag |= IRENAME;
                oldparent = dp->i_number;
                doingdirectory++;
        }
                }
                ip->i_flag |= IRENAME;
                oldparent = dp->i_number;
                doingdirectory++;
        }

-       vrele(ap->a_fdvp);
+       vrele(fdvp);
+
+       /*
+        * When the target exists, both the directory
+        * and target vnodes are returned locked.
+        */
+       dp = VTOI(tdvp);
+       xp = NULL;
+       if (tvp)
+               xp = VTOI(tvp);

 
        /*
         * 1) Bump link count while we're moving stuff
 
        /*
         * 1) Bump link count while we're moving stuff


@@ -808,17 +990,12 @@ ufs_rename (ap)
         */
        ip->i_nlink++;
        ip->i_flag |= ICHG;
         */
        ip->i_nlink++;
        ip->i_flag |= ICHG;

-       error = VOP_UPDATE(ap->a_fvp, &time, &time, 1);
-       IUNLOCK(ip);
+       tv = time;
+       if (error = VOP_UPDATE(fvp, &tv, &tv, 1)) {
+               VOP_UNLOCK(fvp);
+               goto bad;
+       }

 
 

-       /*
-        * When the target exists, both the directory
-        * and target vnodes are returned locked.
-        */
-       dp = VTOI(ap->a_tdvp);
-       xp = NULL;
-       if (ap->a_tvp)
-               xp = VTOI(ap->a_tvp);

        /*
         * If ".." must be changed (ie the directory gets a new
         * parent) then the source directory must not be in the
        /*
         * If ".." must be changed (ie the directory gets a new
         * parent) then the source directory must not be in the


@@ -829,27 +1006,25 @@ ufs_rename (ap)
         * to namei, as the parent directory is unlocked by the
         * call to checkpath().
         */
         * to namei, as the parent directory is unlocked by the
         * call to checkpath().
         */

+       error = VOP_ACCESS(fvp, VWRITE, tcnp->cn_cred, tcnp->cn_proc);
+       VOP_UNLOCK(fvp);

        if (oldparent != dp->i_number)
                newparent = dp->i_number;
        if (doingdirectory && newparent) {
        if (oldparent != dp->i_number)
                newparent = dp->i_number;
        if (doingdirectory && newparent) {

-               VOP_LOCK(ap->a_fvp);
-               error = VOP_ACCESS(ap->a_fvp, VWRITE, ap->a_tcnp->cn_cred, ap->a_tcnp->cn_proc);
-               VOP_UNLOCK(ap->a_fvp);
-               if (error)
+               if (error)      /* write access check above */

                        goto bad;
                if (xp != NULL)
                        goto bad;
                if (xp != NULL)

-                       ufs_iput(xp);
-               if (error = ufs_checkpath(ip, dp, ap->a_tcnp->cn_cred))
+                       vput(tvp);
+               if (error = ufs_checkpath(ip, dp, tcnp->cn_cred))

                        goto out;
                        goto out;

-               if ((ap->a_tcnp->cn_flags & SAVESTART) == 0)
+               if ((tcnp->cn_flags & SAVESTART) == 0)

                        panic("ufs_rename: lost to startdir");
                        panic("ufs_rename: lost to startdir");

-               p->p_spare[1]--;
-               if (error = relookup(ap->a_tdvp, &ap->a_tvp, ap->a_tcnp))
+               if (error = relookup(tdvp, &tvp, tcnp))

                        goto out;
                        goto out;

-               dp = VTOI(ap->a_tdvp);
+               dp = VTOI(tdvp);

                xp = NULL;
                xp = NULL;

-               if (ap->a_tvp)
-                       xp = VTOI(ap->a_tvp);
+               if (tvp)
+                       xp = VTOI(tvp);

        }
        /*
         * 2) If target doesn't exist, link the target
        }
        /*
         * 2) If target doesn't exist, link the target


@@ -873,18 +1048,18 @@ ufs_rename (ap)
                        }
                        dp->i_nlink++;
                        dp->i_flag |= ICHG;
                        }
                        dp->i_nlink++;
                        dp->i_flag |= ICHG;

-                       if (error = VOP_UPDATE(ITOV(dp), &time, &time, 1))
+                       if (error = VOP_UPDATE(tdvp, &tv, &tv, 1))

                                goto bad;
                }
                                goto bad;
                }

-               if (error = ufs_direnter(ip, ap->a_tdvp, ap->a_tcnp)) {
+               if (error = ufs_direnter(ip, tdvp, tcnp)) {

                        if (doingdirectory && newparent) {
                                dp->i_nlink--;
                                dp->i_flag |= ICHG;
                        if (doingdirectory && newparent) {
                                dp->i_nlink--;
                                dp->i_flag |= ICHG;

-                               (void)VOP_UPDATE(ITOV(dp), &time, &time, 1);
+                               (void)VOP_UPDATE(tdvp, &tv, &tv, 1);

                        }
                        goto bad;
                }
                        }
                        goto bad;
                }

-               ufs_iput(dp);
+               vput(tdvp);

        } 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");


@@ -899,9 +1074,9 @@ ufs_rename (ap)
                 * otherwise the destination may not be changed (except by
                 * root). This implements append-only directories.
                 */
                 * otherwise the destination may not be changed (except by
                 * root). This implements append-only directories.
                 */

-               if ((dp->i_mode & ISVTX) && ap->a_tcnp->cn_cred->cr_uid != 0 &&
-                   ap->a_tcnp->cn_cred->cr_uid != dp->i_uid &&
-                   xp->i_uid != ap->a_tcnp->cn_cred->cr_uid) {
+               if ((dp->i_mode & ISVTX) && tcnp->cn_cred->cr_uid != 0 &&
+                   tcnp->cn_cred->cr_uid != dp->i_uid &&
+                   xp->i_uid != tcnp->cn_cred->cr_uid) {

                        error = EPERM;
                        goto bad;
                }
                        error = EPERM;
                        goto bad;
                }


@@ -911,7 +1086,7 @@ ufs_rename (ap)
                 * (both directories, or both not directories).
                 */
                if ((xp->i_mode&IFMT) == IFDIR) {
                 * (both directories, or both not directories).
                 */
                if ((xp->i_mode&IFMT) == IFDIR) {

-                       if (!ufs_dirempty(xp, dp->i_number, ap->a_tcnp->cn_cred) || 
+                       if (!ufs_dirempty(xp, dp->i_number, tcnp->cn_cred) || 

                            xp->i_nlink > 2) {
                                error = ENOTEMPTY;
                                goto bad;
                            xp->i_nlink > 2) {
                                error = ENOTEMPTY;
                                goto bad;


@@ -920,12 +1095,12 @@ ufs_rename (ap)
                                error = ENOTDIR;
                                goto bad;
                        }
                                error = ENOTDIR;
                                goto bad;
                        }

-                       cache_purge(ITOV(dp));
+                       cache_purge(tdvp);

                } else if (doingdirectory) {
                        error = EISDIR;
                        goto bad;
                }
                } else if (doingdirectory) {
                        error = EISDIR;
                        goto bad;
                }

-               if (error = ufs_dirrewrite(dp, ip, ap->a_tcnp))
+               if (error = ufs_dirrewrite(dp, ip, tcnp))

                        goto bad;
                /*
                 * If the target directory is in the same
                        goto bad;
                /*
                 * If the target directory is in the same


@@ -937,7 +1112,7 @@ ufs_rename (ap)
                        dp->i_nlink--;
                        dp->i_flag |= ICHG;
                }
                        dp->i_nlink--;
                        dp->i_flag |= ICHG;
                }

-               ufs_iput(dp);
+               vput(tdvp);

                /*
                 * Adjust the link count of the target to
                 * reflect the dirrewrite above.  If this is
                /*
                 * Adjust the link count of the target to
                 * reflect the dirrewrite above.  If this is


@@ -952,34 +1127,32 @@ ufs_rename (ap)
                if (doingdirectory) {
                        if (--xp->i_nlink != 0)
                                panic("rename: linked directory");
                if (doingdirectory) {
                        if (--xp->i_nlink != 0)
                                panic("rename: linked directory");

-                       error = VOP_TRUNCATE(ITOV(xp), (off_t)0, IO_SYNC,
-                           ap->a_tcnp->cn_cred);
+                       error = VOP_TRUNCATE(tvp, (off_t)0, IO_SYNC,
+                           tcnp->cn_cred, tcnp->cn_proc);

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

-               ufs_iput(xp);
+               vput(tvp);

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

-unlinkit:
-       ap->a_fcnp->cn_flags &= ~MODMASK;
-       ap->a_fcnp->cn_flags |= LOCKPARENT | LOCKLEAF;
-       if ((ap->a_fcnp->cn_flags & SAVESTART) == 0)
+       fcnp->cn_flags &= ~MODMASK;
+       fcnp->cn_flags |= LOCKPARENT | LOCKLEAF;
+       if ((fcnp->cn_flags & SAVESTART) == 0)

                panic("ufs_rename: lost from startdir");
                panic("ufs_rename: lost from startdir");

-       p->p_spare[1]--;
-       (void) relookup(ap->a_fdvp, &ap->a_fvp, ap->a_fcnp);
-       if (ap->a_fvp != NULL) {
-               xp = VTOI(ap->a_fvp);
-               dp = VTOI(ap->a_fdvp);
+       (void) relookup(fdvp, &fvp, fcnp);
+       if (fvp != NULL) {
+               xp = VTOI(fvp);
+               dp = VTOI(fdvp);

        } else {
                /*
                 * From name has disappeared.
                 */
                if (doingdirectory)
                        panic("rename: lost dir entry");
        } else {
                /*
                 * From name has disappeared.
                 */
                if (doingdirectory)
                        panic("rename: lost dir entry");

-               vrele(ITOV(ip));
+               vrele(ap->a_fvp);

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


@@ -1005,30 +1178,38 @@ unlinkit:
                if (doingdirectory && newparent) {
                        dp->i_nlink--;
                        dp->i_flag |= ICHG;
                if (doingdirectory && newparent) {
                        dp->i_nlink--;
                        dp->i_flag |= ICHG;

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

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

-                               ap->a_tcnp->cn_cred, (int *)0, (struct proc *)0);
+                               tcnp->cn_cred, (int *)0, (struct proc *)0);

                        if (error == 0) {
                        if (error == 0) {

-                               if (dirbuf.dotdot_namlen != 2 ||
+#                              if (BYTE_ORDER == LITTLE_ENDIAN)
+                                       if (fvp->v_mount->mnt_maxsymlinklen <= 0)
+                                               namlen = dirbuf.dotdot_type;
+                                       else
+                                               namlen = dirbuf.dotdot_namlen;
+#                              else
+                                       namlen = dirbuf.dotdot_namlen;
+#                              endif
+                               if (namlen != 2 ||

                                    dirbuf.dotdot_name[0] != '.' ||
                                    dirbuf.dotdot_name[1] != '.') {
                                        ufs_dirbad(xp, (doff_t)12,
                                            "rename: mangled dir");
                                } else {
                                        dirbuf.dotdot_ino = newparent;
                                    dirbuf.dotdot_name[0] != '.' ||
                                    dirbuf.dotdot_name[1] != '.') {
                                        ufs_dirbad(xp, (doff_t)12,
                                            "rename: mangled dir");
                                } else {
                                        dirbuf.dotdot_ino = newparent;

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

                                            (caddr_t)&dirbuf,
                                            sizeof (struct dirtemplate),
                                            (off_t)0, UIO_SYSSPACE,
                                            IO_NODELOCKED|IO_SYNC,
                                            (caddr_t)&dirbuf,
                                            sizeof (struct dirtemplate),
                                            (off_t)0, UIO_SYSSPACE,
                                            IO_NODELOCKED|IO_SYNC,

-                                           ap->a_tcnp->cn_cred, (int *)0,
+                                           tcnp->cn_cred, (int *)0,

                                            (struct proc *)0);
                                            (struct proc *)0);

-                                       cache_purge(ITOV(dp));
+                                       cache_purge(fdvp);

                                }
                        }
                }
                                }
                        }
                }

-               error = ufs_dirremove(ap->a_fdvp, ap->a_fcnp);
+               error = ufs_dirremove(fdvp, fcnp);

                if (!error) {
                        xp->i_nlink--;
                        xp->i_flag |= ICHG;
                if (!error) {
                        xp->i_nlink--;
                        xp->i_flag |= ICHG;


@@ -1036,10 +1217,10 @@ unlinkit:
                xp->i_flag &= ~IRENAME;
        }
        if (dp)
                xp->i_flag &= ~IRENAME;
        }
        if (dp)

-               vput(ITOV(dp));
+               vput(fdvp);

        if (xp)
        if (xp)

-               vput(ITOV(xp));
-       vrele(ITOV(ip));
+               vput(fvp);
+       vrele(ap->a_fvp);

        return (error);
 
 bad:
        return (error);
 
 bad:


@@ -1047,9 +1228,12 @@ bad:
                vput(ITOV(xp));
        vput(ITOV(dp));
 out:
                vput(ITOV(xp));
        vput(ITOV(dp));
 out:

-       ip->i_nlink--;
-       ip->i_flag |= ICHG;
-       vrele(ITOV(ip));
+       if (VOP_LOCK(fvp) == 0) {
+               ip->i_nlink--;
+               ip->i_flag |= ICHG;
+               vput(fvp);
+       } else
+               vrele(fvp);

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


@@ -1057,6 +1241,10 @@ out:
  * A virgin directory (no blushing please).
  */
 static struct dirtemplate mastertemplate = {
  * A virgin directory (no blushing please).
  */
 static struct dirtemplate mastertemplate = {

+       0, 12, DT_DIR, 1, ".",
+       0, DIRBLKSIZ - 12, DT_DIR, 2, ".."
+};
+static struct odirtemplate omastertemplate = {

        0, 12, 1, ".",
        0, DIRBLKSIZ - 12, 2, ".."
 };
        0, 12, 1, ".",
        0, DIRBLKSIZ - 12, 2, ".."
 };


@@ -1065,59 +1253,60 @@ static struct dirtemplate mastertemplate = {
  * Mkdir system call
  */
 int
  * Mkdir system call
  */
 int

-ufs_mkdir (ap)
-       struct vop_mkdir_args *ap;
+ufs_mkdir(ap)
+       struct vop_mkdir_args /* {
+               struct vnode *a_dvp;
+               struct vnode **a_vpp;
+               struct componentname *a_cnp;
+               struct vattr *a_vap;
+       } */ *ap;

 {
 {

-       USES_VOP_TRUNCATE;
-       USES_VOP_UPDATE;
-       USES_VOP_VALLOC;
-       USES_VOP_VFREE;
+       register struct vnode *dvp = ap->a_dvp;
+       register struct vattr *vap = ap->a_vap;
+       register struct componentname *cnp = ap->a_cnp;

        register struct inode *ip, *dp;
        struct vnode *tvp;
        register struct inode *ip, *dp;
        struct vnode *tvp;

-       struct dirtemplate dirtemplate;
-       int error;
-       int dmode;
+       struct dirtemplate dirtemplate, *dtp;
+       struct timeval tv;
+       int error, dmode;

 
 #ifdef DIAGNOSTIC
 
 #ifdef DIAGNOSTIC

-       if ((ap->a_cnp->cn_flags & HASBUF) == 0)
+       if ((cnp->cn_flags & HASBUF) == 0)

                panic("ufs_mkdir: no name");
 #endif
                panic("ufs_mkdir: no name");
 #endif

-       dp = VTOI(ap->a_dvp);
+       dp = VTOI(dvp);

        if ((nlink_t)dp->i_nlink >= LINK_MAX) {
        if ((nlink_t)dp->i_nlink >= LINK_MAX) {

-               free(ap->a_cnp->cn_pnbuf, M_NAMEI);
-               ufs_iput(dp);
-               return (EMLINK);
+               error = EMLINK;
+               goto out;

        }
        }

-       dmode = ap->a_vap->va_mode&0777;
+       dmode = vap->va_mode & 0777;

        dmode |= IFDIR;
        /*
        dmode |= IFDIR;
        /*

-        * 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.
+        * Must simulate part of ufs_makeinode here to acquire the inode,
+        * but not have it entered in the parent directory. The entry is
+        * made later after writing "." and ".." entries.

         */
         */

-       if (error = VOP_VALLOC(ap->a_dvp, dmode, ap->a_cnp->cn_cred, &tvp)) {
-               free(ap->a_cnp->cn_pnbuf, M_NAMEI);
-               ufs_iput(dp);
-               return (error);
-       }
+       if (error = VOP_VALLOC(dvp, dmode, cnp->cn_cred, &tvp))
+               goto out;

        ip = VTOI(tvp);
        ip = VTOI(tvp);

-       ip->i_uid = ap->a_cnp->cn_cred->cr_uid;
+       ip->i_uid = cnp->cn_cred->cr_uid;

        ip->i_gid = dp->i_gid;
 #ifdef QUOTA
        if ((error = getinoquota(ip)) ||
        ip->i_gid = dp->i_gid;
 #ifdef QUOTA
        if ((error = getinoquota(ip)) ||

-           (error = chkiq(ip, 1, ap->a_cnp->cn_cred, 0))) {
-               free(ap->a_cnp->cn_pnbuf, M_NAMEI);
+           (error = chkiq(ip, 1, cnp->cn_cred, 0))) {
+               free(cnp->cn_pnbuf, M_NAMEI);

                VOP_VFREE(tvp, ip->i_number, dmode);
                VOP_VFREE(tvp, ip->i_number, dmode);

-               ufs_iput(ip);
-               ufs_iput(dp);
+               vput(tvp);
+               vput(dvp);

                return (error);
        }
 #endif
        ip->i_flag |= IACC|IUPD|ICHG;
        ip->i_mode = dmode;
                return (error);
        }
 #endif
        ip->i_flag |= IACC|IUPD|ICHG;
        ip->i_mode = dmode;

-       ITOV(ip)->v_type = VDIR;        /* Rest init'd in iget() */
+       tvp->v_type = VDIR;     /* Rest init'd in iget() */

        ip->i_nlink = 2;
        ip->i_nlink = 2;

-       error = VOP_UPDATE(ITOV(ip), &time, &time, 1);
+       tv = time;
+       error = VOP_UPDATE(tvp, &tv, &tv, 1);

 
        /*
         * Bump link count in parent directory
 
        /*
         * Bump link count in parent directory


@@ -1127,22 +1316,26 @@ ufs_mkdir (ap)
         */
        dp->i_nlink++;
        dp->i_flag |= ICHG;
         */
        dp->i_nlink++;
        dp->i_flag |= ICHG;

-       if (error = VOP_UPDATE(ITOV(dp), &time, &time, 1))
+       if (error = VOP_UPDATE(dvp, &tv, &tv, 1))

                goto bad;
 
        /* Initialize directory with "." and ".." from static template. */
                goto bad;
 
        /* Initialize directory with "." and ".." from static template. */

-       dirtemplate = mastertemplate;
+       if (dvp->v_mount->mnt_maxsymlinklen > 0)
+               dtp = &mastertemplate;
+       else
+               dtp = (struct dirtemplate *)&omastertemplate;
+       dirtemplate = *dtp;

        dirtemplate.dot_ino = ip->i_number;
        dirtemplate.dotdot_ino = dp->i_number;
        dirtemplate.dot_ino = ip->i_number;
        dirtemplate.dotdot_ino = dp->i_number;

-       error = vn_rdwr(UIO_WRITE, ITOV(ip), (caddr_t)&dirtemplate,
+       error = vn_rdwr(UIO_WRITE, tvp, (caddr_t)&dirtemplate,

            sizeof (dirtemplate), (off_t)0, UIO_SYSSPACE,
            sizeof (dirtemplate), (off_t)0, UIO_SYSSPACE,

-           IO_NODELOCKED|IO_SYNC, ap->a_cnp->cn_cred, (int *)0, (struct proc *)0);
+           IO_NODELOCKED|IO_SYNC, cnp->cn_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 > VFSTOUFS(ap->a_dvp->v_mount)->um_mountp->mnt_stat.f_bsize)
+       if (DIRBLKSIZ > VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_bsize)

                panic("ufs_mkdir: blksize"); /* XXX should grow with balloc() */
        else {
                ip->i_size = DIRBLKSIZ;
                panic("ufs_mkdir: blksize"); /* XXX should grow with balloc() */
        else {
                ip->i_size = DIRBLKSIZ;


@@ -1150,7 +1343,7 @@ ufs_mkdir (ap)
        }
 
        /* Directory set up, now install it's entry in the parent directory. */
        }
 
        /* Directory set up, now install it's entry in the parent directory. */

-       if (error = ufs_direnter(ip, ap->a_dvp, ap->a_cnp)) {
+       if (error = ufs_direnter(ip, dvp, cnp)) {

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


@@ -1162,11 +1355,12 @@ bad:
        if (error) {
                ip->i_nlink = 0;
                ip->i_flag |= ICHG;
        if (error) {
                ip->i_nlink = 0;
                ip->i_flag |= ICHG;

-               ufs_iput(ip);
+               vput(tvp);

        } else
        } else

-               *ap->a_vpp = ITOV(ip);
-       FREE(ap->a_cnp->cn_pnbuf, M_NAMEI);
-       ufs_iput(dp);
+               *ap->a_vpp = tvp;
+out:
+       FREE(cnp->cn_pnbuf, M_NAMEI);
+       vput(dvp);

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


@@ -1174,21 +1368,27 @@ bad:
  * Rmdir system call.
  */
 int
  * Rmdir system call.
  */
 int

-ufs_rmdir (ap)
-       struct vop_rmdir_args *ap;
+ufs_rmdir(ap)
+       struct vop_rmdir_args /* {
+               struct vnode *a_dvp;
+               struct vnode *a_vp;
+               struct componentname *a_cnp;
+       } */ *ap;

 {
 {

-       USES_VOP_TRUNCATE;
+       register struct vnode *vp = ap->a_vp;
+       register struct vnode *dvp = ap->a_dvp;
+       register struct componentname *cnp = ap->a_cnp;

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

-       ip = VTOI(ap->a_vp);
-       dp = VTOI(ap->a_dvp);
+       ip = VTOI(vp);
+       dp = VTOI(dvp);

        /*
         * No rmdir "." please.
         */
        if (dp == ip) {
        /*
         * No rmdir "." please.
         */
        if (dp == ip) {

-               vrele(ap->a_dvp);
-               ufs_iput(ip);
+               vrele(dvp);
+               vput(vp);

                return (EINVAL);
        }
        /*
                return (EINVAL);
        }
        /*


@@ -1200,22 +1400,26 @@ ufs_rmdir (ap)
         */
        error = 0;
        if (ip->i_nlink != 2 ||
         */
        error = 0;
        if (ip->i_nlink != 2 ||

-           !ufs_dirempty(ip, dp->i_number, ap->a_cnp->cn_cred)) {
+           !ufs_dirempty(ip, dp->i_number, cnp->cn_cred)) {

                error = ENOTEMPTY;
                goto out;
        }
                error = ENOTEMPTY;
                goto out;
        }

+       if ((dp->i_flags & APPEND) || (ip->i_flags & (IMMUTABLE | APPEND))) {
+               error = EPERM;
+               goto out;
+       }

        /*
         * Delete reference to directory before purging
         * inode.  If we crash in between, the directory
         * will be reattached to lost+found,
         */
        /*
         * Delete reference to directory before purging
         * inode.  If we crash in between, the directory
         * will be reattached to lost+found,
         */

-       if (error = ufs_dirremove(ap->a_dvp, ap->a_cnp))
+       if (error = ufs_dirremove(dvp, cnp))

                goto out;
        dp->i_nlink--;
        dp->i_flag |= ICHG;
                goto out;
        dp->i_nlink--;
        dp->i_flag |= ICHG;

-       cache_purge(ap->a_dvp);
-       ufs_iput(dp);
-       ap->a_dvp = NULL;
+       cache_purge(dvp);
+       vput(dvp);
+       dvp = NULL;

        /*
         * Truncate inode.  The only stuff left
         * in the directory is "." and "..".  The
        /*
         * Truncate inode.  The only stuff left
         * in the directory is "." and "..".  The


@@ -1228,12 +1432,13 @@ ufs_rmdir (ap)
         * worry about them later.
         */
        ip->i_nlink -= 2;
         * worry about them later.
         */
        ip->i_nlink -= 2;

-       error = VOP_TRUNCATE(ap->a_vp, (off_t)0, IO_SYNC, ap->a_cnp->cn_cred);
+       error = VOP_TRUNCATE(vp, (off_t)0, IO_SYNC, cnp->cn_cred,
+           cnp->cn_proc);

        cache_purge(ITOV(ip));
 out:
        cache_purge(ITOV(ip));
 out:

-       if (ap->a_dvp)
-               ufs_iput(dp);
-       ufs_iput(ip);
+       if (dvp)
+               vput(dvp);
+       vput(vp);

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


@@ -1241,17 +1446,34 @@ out:
  * symlink -- make a symbolic link
  */
 int
  * symlink -- make a symbolic link
  */
 int

-ufs_symlink (ap)
-       struct vop_symlink_args *ap;
+ufs_symlink(ap)
+       struct vop_symlink_args /* {
+               struct vnode *a_dvp;
+               struct vnode **a_vpp;
+               struct componentname *a_cnp;
+               struct vattr *a_vap;
+               char *a_target;
+       } */ *ap;

 {
 {

-       int error;
+       register struct vnode *vp, **vpp = ap->a_vpp;
+       register struct inode *ip;
+       int len, error;

 
 

-       if (error = ufs_makeinode(IFLNK | ap->a_vap->va_mode, ap->a_dvp, ap->a_vpp, ap->a_cnp))
+       if (error = ufs_makeinode(IFLNK | ap->a_vap->va_mode, ap->a_dvp,
+           vpp, ap->a_cnp))

                return (error);
                return (error);

-       error = vn_rdwr(UIO_WRITE, *ap->a_vpp, ap->a_target, strlen(ap->a_target), (off_t)0,
-               UIO_SYSSPACE, IO_NODELOCKED, ap->a_cnp->cn_cred, (int *)0,
-               (struct proc *)0);
-       vput(*ap->a_vpp);
+       vp = *vpp;
+       len = strlen(ap->a_target);
+       if (len < vp->v_mount->mnt_maxsymlinklen) {
+               ip = VTOI(vp);
+               bcopy(ap->a_target, (char *)ip->i_shortlink, len);
+               ip->i_size = len;
+               ip->i_flag |= IUPD|ICHG;
+       } else
+               error = vn_rdwr(UIO_WRITE, vp, ap->a_target, len, (off_t)0,
+                   UIO_SYSSPACE, IO_NODELOCKED, ap->a_cnp->cn_cred, (int *)0,
+                   (struct proc *)0);
+       vput(vp);

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


@@ -1265,25 +1487,66 @@ ufs_symlink (ap)
  * by <sys/dirent.h>.
  */
 int
  * by <sys/dirent.h>.
  */
 int

-ufs_readdir (ap)
-       struct vop_readdir_args *ap;
+ufs_readdir(ap)
+       struct vop_readdir_args /* {
+               struct vnode *a_vp;
+               struct uio *a_uio;
+               struct ucred *a_cred;
+       } */ *ap;

 {
 {

-       USES_VOP_READ;
+       register struct uio *uio = ap->a_uio;

        int count, lost, error;
 
        int count, lost, error;
 

-       count = ap->a_uio->uio_resid;
+       count = uio->uio_resid;

        count &= ~(DIRBLKSIZ - 1);
        count &= ~(DIRBLKSIZ - 1);

-       lost = ap->a_uio->uio_resid - count;
-       if (count < DIRBLKSIZ || (ap->a_uio->uio_offset & (DIRBLKSIZ -1)))
+       lost = uio->uio_resid - count;
+       if (count < DIRBLKSIZ || (uio->uio_offset & (DIRBLKSIZ -1)))

                return (EINVAL);
                return (EINVAL);

-       ap->a_uio->uio_resid = count;
-       ap->a_uio->uio_iov->iov_len = count;
-       error = VOP_READ(ap->a_vp, ap->a_uio, 0, ap->a_cred);
-       ap->a_uio->uio_resid += lost;
-       if ((VTOI(ap->a_vp)->i_size - ap->a_uio->uio_offset) <= 0)
-               *ap->a_eofflagp = 1;
-       else
-               *ap->a_eofflagp = 0;
+       uio->uio_resid = count;
+       uio->uio_iov->iov_len = count;
+#      if (BYTE_ORDER == LITTLE_ENDIAN)
+               if (ap->a_vp->v_mount->mnt_maxsymlinklen > 0) {
+                       error = VOP_READ(ap->a_vp, uio, 0, ap->a_cred);
+               } else {
+                       struct dirent *dp, *edp;
+                       struct uio auio;
+                       struct iovec aiov;
+                       caddr_t dirbuf;
+                       int readcnt;
+                       u_char tmp;
+
+                       auio = *uio;
+                       auio.uio_iov = &aiov;
+                       auio.uio_iovcnt = 1;
+                       auio.uio_segflg = UIO_SYSSPACE;
+                       aiov.iov_len = count;
+                       MALLOC(dirbuf, caddr_t, count, M_TEMP, M_WAITOK);
+                       aiov.iov_base = dirbuf;
+                       error = VOP_READ(ap->a_vp, &auio, 0, ap->a_cred);
+                       if (error == 0) {
+                               readcnt = count - auio.uio_resid;
+                               edp = (struct dirent *)&dirbuf[readcnt];
+                               for (dp = (struct dirent *)dirbuf; dp < edp; ) {
+                                       tmp = dp->d_namlen;
+                                       dp->d_namlen = dp->d_type;
+                                       dp->d_type = tmp;
+                                       if (dp->d_reclen > 0) {
+                                               dp = (struct dirent *)
+                                                   ((char *)dp + dp->d_reclen);
+                                       } else {
+                                               error = EIO;
+                                               break;
+                                       }
+                               }
+                               if (dp >= edp)
+                                       error = uiomove(dirbuf, readcnt, uio);
+                       }
+                       FREE(dirbuf, M_TEMP);
+               }
+#      else
+               error = VOP_READ(ap->a_vp, uio, 0, ap->a_cred);
+#      endif
+       uio->uio_resid += lost;

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


@@ -1291,12 +1554,23 @@ ufs_readdir (ap)
  * Return target name of a symbolic link
  */
 int
  * Return target name of a symbolic link
  */
 int

-ufs_readlink (ap)
-       struct vop_readlink_args *ap;
+ufs_readlink(ap)
+       struct vop_readlink_args /* {
+               struct vnode *a_vp;
+               struct uio *a_uio;
+               struct ucred *a_cred;
+       } */ *ap;

 {
 {

-       USES_VOP_READ;
+       register struct vnode *vp = ap->a_vp;
+       register struct inode *ip = VTOI(vp);
+       int isize;

 
 

-       return (VOP_READ(ap->a_vp, ap->a_uio, 0, ap->a_cred));
+       isize = ip->i_size;
+       if (isize < vp->v_mount->mnt_maxsymlinklen) {
+               uiomove((char *)ip->i_shortlink, isize, ap->a_uio);
+               return (0);
+       }
+       return (VOP_READ(vp, ap->a_uio, 0, ap->a_cred));

 }
 
 /*
 }
 
 /*


@@ -1305,8 +1579,11 @@ ufs_readlink (ap)
  */
 /* ARGSUSED */
 int
  */
 /* ARGSUSED */
 int

-ufs_abortop (ap)
-       struct vop_abortop_args *ap;
+ufs_abortop(ap)
+       struct vop_abortop_args /* {
+               struct vnode *a_dvp;
+               struct componentname *a_cnp;
+       } */ *ap;

 {
        if ((ap->a_cnp->cn_flags & (HASBUF | SAVESTART)) == HASBUF)
                FREE(ap->a_cnp->cn_pnbuf, M_NAMEI);
 {
        if ((ap->a_cnp->cn_flags & (HASBUF | SAVESTART)) == HASBUF)
                FREE(ap->a_cnp->cn_pnbuf, M_NAMEI);


@@ -1314,30 +1591,83 @@ ufs_abortop (ap)
 }
 
 /*
 }
 
 /*

- * Lock an inode.
+ * Lock an inode. If its already locked, set the WANT bit and sleep.

  */
 int
  */
 int

-ufs_lock (ap)
-       struct vop_lock_args *ap;
+ufs_lock(ap)
+       struct vop_lock_args /* {
+               struct vnode *a_vp;
+       } */ *ap;

 {
 {

-       register struct inode *ip = VTOI(ap->a_vp);
+       register struct vnode *vp = ap->a_vp;
+       register struct inode *ip;
+       struct proc *p = curproc;       /* XXX */

 
 

-       ILOCK(ip);
+start:
+       while (vp->v_flag & VXLOCK) {
+               vp->v_flag |= VXWANT;
+               sleep((caddr_t)vp, PINOD);
+       }
+       if (vp->v_tag == VT_NON)
+               return (ENOENT);
+       ip = VTOI(vp);
+       if (ip->i_flag & ILOCKED) {
+               ip->i_flag |= IWANT;
+#ifdef DIAGNOSTIC
+               if (p) {
+                       if (p->p_pid == ip->i_lockholder)
+                               panic("locking against myself");
+                       ip->i_lockwaiter = p->p_pid;
+               } else
+                       ip->i_lockwaiter = -1;
+#endif
+               (void) sleep((caddr_t)ip, PINOD);
+               goto start;
+       }
+#ifdef DIAGNOSTIC
+       ip->i_lockwaiter = 0;
+       if (ip->i_lockholder != 0)
+               panic("lockholder (%d) != 0", ip->i_lockholder);
+       if (p && p->p_pid == 0)
+               printf("locking by process 0\n");
+       if (p)
+               ip->i_lockholder = p->p_pid;
+       else
+               ip->i_lockholder = -1;
+#endif
+       ip->i_flag |= ILOCKED;

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

- * Unlock an inode.
+ * Unlock an inode.  If WANT bit is on, wakeup.

  */
  */

+int lockcount = 90;

 int
 int

-ufs_unlock (ap)
-       struct vop_unlock_args *ap;
+ufs_unlock(ap)
+       struct vop_unlock_args /* {
+               struct vnode *a_vp;
+       } */ *ap;

 {
        register struct inode *ip = VTOI(ap->a_vp);
 {
        register struct inode *ip = VTOI(ap->a_vp);

+       struct proc *p = curproc;       /* XXX */

 
 

-       if (!(ip->i_flag & ILOCKED))
+#ifdef DIAGNOSTIC
+       if ((ip->i_flag & ILOCKED) == 0) {
+               vprint("ufs_unlock: unlocked inode", ap->a_vp);

                panic("ufs_unlock NOT LOCKED");
                panic("ufs_unlock NOT LOCKED");

-       IUNLOCK(ip);
+       }
+       if (p && p->p_pid != ip->i_lockholder && p->p_pid > -1 &&
+           ip->i_lockholder > -1 && lockcount++ < 100)
+               panic("unlocker (%d) != lock holder (%d)",
+                   p->p_pid, ip->i_lockholder);
+       ip->i_lockholder = 0;
+#endif
+       ip->i_flag &= ~ILOCKED;
+       if (ip->i_flag & IWANT) {
+               ip->i_flag &= ~IWANT;
+               wakeup((caddr_t)ip);
+       }

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


@@ -1345,8 +1675,10 @@ ufs_unlock (ap)
  * Check for a locked inode.
  */
 int
  * Check for a locked inode.
  */
 int

-ufs_islocked (ap)
-       struct vop_islocked_args *ap;
+ufs_islocked(ap)
+       struct vop_islocked_args /* {
+               struct vnode *a_vp;
+       } */ *ap;

 {
 
        if (VTOI(ap->a_vp)->i_flag & ILOCKED)
 {
 
        if (VTOI(ap->a_vp)->i_flag & ILOCKED)


@@ -1359,34 +1691,36 @@ ufs_islocked (ap)
  * then call the device strategy routine.
  */
 int
  * then call the device strategy routine.
  */
 int

-ufs_strategy (ap)
-       struct vop_strategy_args *ap;
+ufs_strategy(ap)
+       struct vop_strategy_args /* {
+               struct buf *a_bp;
+       } */ *ap;

 {
 {

-       USES_VOP_BMAP;
+       register struct buf *bp = ap->a_bp;
+       register struct vnode *vp = bp->b_vp;

        register struct inode *ip;
        register struct inode *ip;

-       struct vnode *vp;

        int error;
 
        int error;
 

-       ip = VTOI(ap->a_bp->b_vp);
-       if (ap->a_bp->b_vp->v_type == VBLK || ap->a_bp->b_vp->v_type == VCHR)
+       ip = VTOI(vp);
+       if (vp->v_type == VBLK || vp->v_type == VCHR)

                panic("ufs_strategy: spec");
                panic("ufs_strategy: spec");

-       if (ap->a_bp->b_blkno == ap->a_bp->b_lblkno) {
+       if (bp->b_blkno == bp->b_lblkno) {

                if (error =
                if (error =

-                   VOP_BMAP(ap->a_bp->b_vp, ap->a_bp->b_lblkno, NULL, &ap->a_bp->b_blkno)) {
-                       ap->a_bp->b_error = error;
-                       ap->a_bp->b_flags |= B_ERROR;
-                       biodone(ap->a_bp);
+                   VOP_BMAP(vp, bp->b_lblkno, NULL, &bp->b_blkno, NULL)) {
+                       bp->b_error = error;
+                       bp->b_flags |= B_ERROR;
+                       biodone(bp);

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

-               if ((long)ap->a_bp->b_blkno == -1)
-                       clrbuf(ap->a_bp);
+               if ((long)bp->b_blkno == -1)
+                       clrbuf(bp);

        }
        }

-       if ((long)ap->a_bp->b_blkno == -1) {
-               biodone(ap->a_bp);
+       if ((long)bp->b_blkno == -1) {
+               biodone(bp);

                return (0);
        }
        vp = ip->i_devvp;
                return (0);
        }
        vp = ip->i_devvp;

-       ap->a_bp->b_dev = vp->v_rdev;
+       bp->b_dev = vp->v_rdev;

        VOCALL (vp->v_op, VOFFSET(vop_strategy), ap);
        return (0);
 }
        VOCALL (vp->v_op, VOFFSET(vop_strategy), ap);
        return (0);
 }


@@ -1395,16 +1729,19 @@ ufs_strategy (ap)
  * Print out the contents of an inode.
  */
 int
  * Print out the contents of an inode.
  */
 int

-ufs_print (ap)
-       struct vop_print_args *ap;
+ufs_print(ap)
+       struct vop_print_args /* {
+               struct vnode *a_vp;
+       } */ *ap;

 {
 {

-       register struct inode *ip = VTOI(ap->a_vp);
+       register struct vnode *vp = ap->a_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
 
        printf("tag VT_UFS, ino %d, on dev %d, %d", ip->i_number,
                major(ip->i_dev), minor(ip->i_dev));
 #ifdef FIFO

-       if (ap->a_vp->v_type == VFIFO)
-               fifo_printinfo(ap->a_vp);
+       if (vp->v_type == VFIFO)
+               fifo_printinfo(vp);

 #endif /* FIFO */
        printf("%s\n", (ip->i_flag & ILOCKED) ? " (LOCKED)" : "");
        if (ip->i_lockholder == 0)
 #endif /* FIFO */
        printf("%s\n", (ip->i_flag & ILOCKED) ? " (LOCKED)" : "");
        if (ip->i_lockholder == 0)


@@ -1420,10 +1757,14 @@ ufs_print (ap)
  * Read wrapper for special devices.
  */
 int
  * Read wrapper for special devices.
  */
 int

-ufsspec_read (ap)
-       struct vop_read_args *ap;
+ufsspec_read(ap)
+       struct vop_read_args /* {
+               struct vnode *a_vp;
+               struct uio *a_uio;
+               int  a_ioflag;
+               struct ucred *a_cred;
+       } */ *ap;

 {
 {

-       extern int (**spec_vnodeop_p)();

 
        /*
         * Set access flag.
 
        /*
         * Set access flag.


@@ -1436,10 +1777,14 @@ ufsspec_read (ap)
  * Write wrapper for special devices.
  */
 int
  * Write wrapper for special devices.
  */
 int

-ufsspec_write (ap)
-       struct vop_write_args *ap;
+ufsspec_write(ap)
+       struct vop_write_args /* {
+               struct vnode *a_vp;
+               struct uio *a_uio;
+               int  a_ioflag;
+               struct ucred *a_cred;
+       } */ *ap;

 {
 {

-       extern int (**spec_vnodeop_p)();

 
        /*
         * Set update and change flags.
 
        /*
         * Set update and change flags.


@@ -1454,10 +1799,14 @@ ufsspec_write (ap)
  * Update the times on the inode then do device close.
  */
 int
  * Update the times on the inode then do device close.
  */
 int

-ufsspec_close (ap)
-       struct vop_close_args *ap;
+ufsspec_close(ap)
+       struct vop_close_args /* {
+               struct vnode *a_vp;
+               int  a_fflag;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

 {
 {

-       extern int (**spec_vnodeop_p)();

        register struct inode *ip = VTOI(ap->a_vp);
 
        if (ap->a_vp->v_usecount > 1 && !(ip->i_flag & ILOCKED))
        register struct inode *ip = VTOI(ap->a_vp);
 
        if (ap->a_vp->v_usecount > 1 && !(ip->i_flag & ILOCKED))


@@ -1470,8 +1819,13 @@ ufsspec_close (ap)
  * Read wrapper for fifo's
  */
 int
  * Read wrapper for fifo's
  */
 int

-ufsfifo_read (ap)
-       struct vop_read_args *ap;
+ufsfifo_read(ap)
+       struct vop_read_args /* {
+               struct vnode *a_vp;
+               struct uio *a_uio;
+               int  a_ioflag;
+               struct ucred *a_cred;
+       } */ *ap;

 {
        extern int (**fifo_vnodeop_p)();
 
 {
        extern int (**fifo_vnodeop_p)();
 


@@ -1486,8 +1840,13 @@ ufsfifo_read (ap)
  * Write wrapper for fifo's.
  */
 int
  * Write wrapper for fifo's.
  */
 int

-ufsfifo_write (ap)
-       struct vop_write_args *ap;
+ufsfifo_write(ap)
+       struct vop_write_args /* {
+               struct vnode *a_vp;
+               struct uio *a_uio;
+               int  a_ioflag;
+               struct ucred *a_cred;
+       } */ *ap;

 {
        extern int (**fifo_vnodeop_p)();
 
 {
        extern int (**fifo_vnodeop_p)();
 


@@ -1503,8 +1862,13 @@ ufsfifo_write (ap)
  *
  * Update the times on the inode then do device close.
  */
  *
  * Update the times on the inode then do device close.
  */

-ufsfifo_close (ap)
-       struct vop_close_args *ap;
+ufsfifo_close(ap)
+       struct vop_close_args /* {
+               struct vnode *a_vp;
+               int  a_fflag;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

 {
        extern int (**fifo_vnodeop_p)();
        register struct inode *ip = VTOI(ap->a_vp);
 {
        extern int (**fifo_vnodeop_p)();
        register struct inode *ip = VTOI(ap->a_vp);


@@ -1515,14 +1879,57 @@ ufsfifo_close (ap)
 }
 #endif /* FIFO */
 
 }
 #endif /* FIFO */
 

+/*
+ * Return POSIX pathconf information applicable to ufs filesystems.
+ */
+ufs_pathconf(ap)
+       struct vop_pathconf_args /* {
+               struct vnode *a_vp;
+               int a_name;
+               int *a_retval;
+       } */ *ap;
+{
+
+       switch (ap->a_name) {
+       case _PC_LINK_MAX:
+               *ap->a_retval = LINK_MAX;
+               return (0);
+       case _PC_NAME_MAX:
+               *ap->a_retval = NAME_MAX;
+               return (0);
+       case _PC_PATH_MAX:
+               *ap->a_retval = PATH_MAX;
+               return (0);
+       case _PC_PIPE_BUF:
+               *ap->a_retval = PIPE_BUF;
+               return (0);
+       case _PC_CHOWN_RESTRICTED:
+               *ap->a_retval = 1;
+               return (0);
+       case _PC_NO_TRUNC:
+               *ap->a_retval = 1;
+               return (0);
+       default:
+               return (EINVAL);
+       }
+       /* NOTREACHED */
+}
+

 /*
  * Advisory record locking support
  */
 int
 /*
  * Advisory record locking support
  */
 int

-ufs_advlock (ap)
-       struct vop_advlock_args *ap;
+ufs_advlock(ap)
+       struct vop_advlock_args /* {
+               struct vnode *a_vp;
+               caddr_t  a_id;
+               int  a_op;
+               struct flock *a_fl;
+               int  a_flags;
+       } */ *ap;

 {
        register struct inode *ip = VTOI(ap->a_vp);
 {
        register struct inode *ip = VTOI(ap->a_vp);

+       register struct flock *fl = ap->a_fl;

        register struct lockf *lock;
        off_t start, end;
        int error;
        register struct lockf *lock;
        off_t start, end;
        int error;


@@ -1532,14 +1939,14 @@ ufs_advlock (ap)
         */
        if (ip->i_lockf == (struct lockf *)0) {
                if (ap->a_op != F_SETLK) {
         */
        if (ip->i_lockf == (struct lockf *)0) {
                if (ap->a_op != F_SETLK) {

-                       ap->a_fl->l_type = F_UNLCK;
+                       fl->l_type = F_UNLCK;

                        return (0);
                }
        }
        /*
         * Convert the flock structure into a start and end.
         */
                        return (0);
                }
        }
        /*
         * Convert the flock structure into a start and end.
         */

-       switch (ap->a_fl->l_whence) {
+       switch (fl->l_whence) {

 
        case SEEK_SET:
        case SEEK_CUR:
 
        case SEEK_SET:
        case SEEK_CUR:


@@ -1547,11 +1954,11 @@ ufs_advlock (ap)
                 * Caller is responsible for adding any necessary offset
                 * when SEEK_CUR is used.
                 */
                 * Caller is responsible for adding any necessary offset
                 * when SEEK_CUR is used.
                 */

-               start = ap->a_fl->l_start;
+               start = fl->l_start;

                break;
 
        case SEEK_END:
                break;
 
        case SEEK_END:

-               start = ip->i_size + ap->a_fl->l_start;
+               start = ip->i_size + fl->l_start;

                break;
 
        default:
                break;
 
        default:


@@ -1559,10 +1966,10 @@ ufs_advlock (ap)
        }
        if (start < 0)
                return (EINVAL);
        }
        if (start < 0)
                return (EINVAL);

-       if (ap->a_fl->l_len == 0)
+       if (fl->l_len == 0)

                end = -1;
        else
                end = -1;
        else

-               end = start + ap->a_fl->l_len - 1;
+               end = start + fl->l_len - 1;

        /*
         * Create the lockf structure
         */
        /*
         * Create the lockf structure
         */


@@ -1571,7 +1978,7 @@ ufs_advlock (ap)
        lock->lf_end = end;
        lock->lf_id = ap->a_id;
        lock->lf_inode = ip;
        lock->lf_end = end;
        lock->lf_id = ap->a_id;
        lock->lf_inode = ip;

-       lock->lf_type = ap->a_fl->l_type;
+       lock->lf_type = fl->l_type;

        lock->lf_next = (struct lockf *)0;
        lock->lf_block = (struct lockf *)0;
        lock->lf_flags = ap->a_flags;
        lock->lf_next = (struct lockf *)0;
        lock->lf_block = (struct lockf *)0;
        lock->lf_flags = ap->a_flags;


@@ -1588,7 +1995,7 @@ ufs_advlock (ap)
                return (error);
 
        case F_GETLK:
                return (error);
 
        case F_GETLK:

-               error = lf_getlock(lock, ap->a_fl);
+               error = lf_getlock(lock, fl);

                FREE(lock, M_LOCKF);
                return (error);
        
                FREE(lock, M_LOCKF);
                return (error);
        


@@ -1610,9 +2017,8 @@ ufs_vinit(mntp, specops, fifoops, vpp)
        int (**fifoops)();
        struct vnode **vpp;
 {
        int (**fifoops)();
        struct vnode **vpp;
 {

-       struct inode *ip, *nip;
+       struct inode *ip;

        struct vnode *vp, *nvp;
        struct vnode *vp, *nvp;

-       extern int (**spec_vnodeop_p)();

 
        vp = *vpp;
        ip = VTOI(vp);
 
        vp = *vpp;
        ip = VTOI(vp);


@@ -1624,8 +2030,8 @@ ufs_vinit(mntp, specops, fifoops, vpp)
                        /*
                         * Discard unneeded vnode, but save its inode.
                         */
                        /*
                         * Discard unneeded vnode, but save its inode.
                         */

-                       remque(ip);
-                       IUNLOCK(ip);
+                       ufs_ihashrem(ip);
+                       VOP_UNLOCK(vp);

                        nvp->v_data = vp->v_data;
                        vp->v_data = NULL;
                        vp->v_op = spec_vnodeop_p;
                        nvp->v_data = vp->v_data;
                        vp->v_data = NULL;
                        vp->v_op = spec_vnodeop_p;


@@ -1668,10 +2074,8 @@ ufs_makeinode(mode, dvp, vpp, cnp)
        struct vnode **vpp;
        struct componentname *cnp;
 {
        struct vnode **vpp;
        struct componentname *cnp;
 {

-       USES_VOP_UPDATE;
-       USES_VOP_VALLOC;
-       USES_VOP_VFREE;

        register struct inode *ip, *pdir;
        register struct inode *ip, *pdir;

+       struct timeval tv;

        struct vnode *tvp;
        int error;
 
        struct vnode *tvp;
        int error;
 


@@ -1686,19 +2090,22 @@ ufs_makeinode(mode, dvp, vpp, cnp)
 
        if (error = VOP_VALLOC(dvp, mode, cnp->cn_cred, &tvp)) {
                free(cnp->cn_pnbuf, M_NAMEI);
 
        if (error = VOP_VALLOC(dvp, mode, cnp->cn_cred, &tvp)) {
                free(cnp->cn_pnbuf, M_NAMEI);

-               ufs_iput(pdir);
+               vput(dvp);

                return (error);
        }
        ip = VTOI(tvp);
                return (error);
        }
        ip = VTOI(tvp);

-       ip->i_uid = cnp->cn_cred->cr_uid;

        ip->i_gid = pdir->i_gid;
        ip->i_gid = pdir->i_gid;

+       if ((mode & IFMT) == IFLNK)
+               ip->i_uid = pdir->i_uid;
+       else
+               ip->i_uid = cnp->cn_cred->cr_uid;

 #ifdef QUOTA
        if ((error = getinoquota(ip)) ||
            (error = chkiq(ip, 1, cnp->cn_cred, 0))) {
                free(cnp->cn_pnbuf, M_NAMEI);
                VOP_VFREE(tvp, ip->i_number, mode);
 #ifdef QUOTA
        if ((error = getinoquota(ip)) ||
            (error = chkiq(ip, 1, cnp->cn_cred, 0))) {
                free(cnp->cn_pnbuf, M_NAMEI);
                VOP_VFREE(tvp, ip->i_number, mode);

-               ufs_iput(ip);
-               ufs_iput(pdir);
+               vput(tvp);
+               vput(dvp);

                return (error);
        }
 #endif
                return (error);
        }
 #endif


@@ -1713,13 +2120,14 @@ ufs_makeinode(mode, dvp, vpp, cnp)
        /*
         * Make sure inode goes to disk before directory entry.
         */
        /*
         * Make sure inode goes to disk before directory entry.
         */

-       if (error = VOP_UPDATE(tvp, &time, &time, 1))
+       tv = time;
+       if (error = VOP_UPDATE(tvp, &tv, &tv, 1))

                goto bad;
        if (error = ufs_direnter(ip, dvp, cnp))
                goto bad;
        if ((cnp->cn_flags & SAVESTART) == 0)
                FREE(cnp->cn_pnbuf, M_NAMEI);
                goto bad;
        if (error = ufs_direnter(ip, dvp, cnp))
                goto bad;
        if ((cnp->cn_flags & SAVESTART) == 0)
                FREE(cnp->cn_pnbuf, M_NAMEI);

-       ufs_iput(pdir);
+       vput(dvp);

        *vpp = tvp;
        return (0);
 
        *vpp = tvp;
        return (0);
 


@@ -1729,9 +2137,9 @@ bad:
         * or the directory so must deallocate the inode.
         */
        free(cnp->cn_pnbuf, M_NAMEI);
         * or the directory so must deallocate the inode.
         */
        free(cnp->cn_pnbuf, M_NAMEI);

-       ufs_iput(pdir);
+       vput(dvp);

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

-       ufs_iput(ip);
+       vput(tvp);

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