build and read directories appropriately for the type of filesystem

[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 a2ce484..ab6fcd2 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.97 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.100 (Berkeley) %G%

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


@@ -22,6 +22,7 @@
 #include <sys/specdev.h>
 #include <sys/fifo.h>
 #include <sys/malloc.h>
 #include <sys/specdev.h>
 #include <sys/fifo.h>
 #include <sys/malloc.h>

+#include <sys/dirent.h>

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


@@ -58,7 +59,12 @@ union _qcvt {
  */
 int
 ufs_create(ap)
  */
 int
 ufs_create(ap)

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

 {
        int error;
 
 {
        int error;
 


@@ -75,7 +81,12 @@ ufs_create(ap)
 /* ARGSUSED */
 int
 ufs_mknod(ap)
 /* ARGSUSED */
 int
 ufs_mknod(ap)

-       struct vop_mknod_args *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 vattr *vap = ap->a_vap;
        register struct vnode **vpp = ap->a_vpp;


@@ -115,7 +126,12 @@ ufs_mknod(ap)
 /* ARGSUSED */
 int
 ufs_open(ap)
 /* ARGSUSED */
 int
 ufs_open(ap)

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

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


@@ -129,7 +145,12 @@ ufs_open(ap)
 /* ARGSUSED */
 int
 ufs_close(ap)
 /* ARGSUSED */
 int
 ufs_close(ap)

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

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


@@ -146,7 +167,12 @@ ufs_close(ap)
  */
 int
 ufs_access(ap)
  */
 int
 ufs_access(ap)

-       struct vop_access_args *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 vnode *vp = ap->a_vp;
 {
        USES_VOP_ISLOCKED;
        register struct vnode *vp = ap->a_vp;


@@ -199,7 +225,12 @@ found:
 /* ARGSUSED */
 int
 ufs_getattr(ap)
 /* ARGSUSED */
 int
 ufs_getattr(ap)

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

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


@@ -240,7 +271,12 @@ ufs_getattr(ap)
  */
 int
 ufs_setattr(ap)
  */
 int
 ufs_setattr(ap)

-       struct vop_setattr_args *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;
 {
        USES_VOP_TRUNCATE;
        USES_VOP_UPDATE;


@@ -270,7 +306,7 @@ ufs_setattr(ap)
        if (vap->va_size != VNOVAL) {
                if (vp->v_type == VDIR)
                        return (EISDIR);
        if (vap->va_size != VNOVAL) {
                if (vp->v_type == VDIR)
                        return (EISDIR);

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

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


@@ -449,7 +485,14 @@ good:
 /* ARGSUSED */
 int
 ufs_ioctl(ap)
 /* ARGSUSED */
 int
 ufs_ioctl(ap)

-       struct vop_ioctl_args *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);


@@ -458,7 +501,13 @@ ufs_ioctl(ap)
 /* ARGSUSED */
 int
 ufs_select(ap)
 /* ARGSUSED */
 int
 ufs_select(ap)

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

 {
 
        /*
 {
 
        /*


@@ -475,7 +524,12 @@ ufs_select(ap)
 /* ARGSUSED */
 int
 ufs_mmap(ap)
 /* ARGSUSED */
 int
 ufs_mmap(ap)

-       struct vop_mmap_args *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);


@@ -489,7 +543,12 @@ ufs_mmap(ap)
 /* ARGSUSED */
 int
 ufs_seek(ap)
 /* ARGSUSED */
 int
 ufs_seek(ap)

-       struct vop_seek_args *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);


@@ -502,7 +561,11 @@ ufs_seek(ap)
  */
 int
 ufs_remove(ap)
  */
 int
 ufs_remove(ap)

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

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


@@ -527,7 +590,11 @@ ufs_remove(ap)
  */
 int
 ufs_link(ap)
  */
 int
 ufs_link(ap)

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

 {
        USES_VOP_UPDATE;
        USES_VOP_ABORTOP;
 {
        USES_VOP_UPDATE;
        USES_VOP_ABORTOP;


@@ -758,7 +825,14 @@ bad:
  */
 int
 ufs_rename(ap)
  */
 int
 ufs_rename(ap)

-       struct vop_rename_args *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_ABORTOP;
        USES_VOP_ACCESS;


@@ -777,6 +851,7 @@ ufs_rename(ap)
        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;

 
        /* Check for cross-device rename */
        if ((fvp->v_mount != tdvp->v_mount) ||
 
        /* Check for cross-device rename */
        if ((fvp->v_mount != tdvp->v_mount) ||


@@ -993,7 +1068,7 @@ ufs_rename(ap)
                        if (--xp->i_nlink != 0)
                                panic("rename: linked directory");
                        error = VOP_TRUNCATE(ITOV(xp), (off_t)0, IO_SYNC,
                        if (--xp->i_nlink != 0)
                                panic("rename: linked directory");
                        error = VOP_TRUNCATE(ITOV(xp), (off_t)0, IO_SYNC,

-                           tcnp->cn_cred);
+                           tcnp->cn_cred, tcnp->cn_proc);

                }
                xp->i_flag |= ICHG;
                ufs_iput(xp);
                }
                xp->i_flag |= ICHG;
                ufs_iput(xp);


@@ -1050,7 +1125,15 @@ unlinkit:
                                UIO_SYSSPACE, IO_NODELOCKED, 
                                tcnp->cn_cred, (int *)0, (struct proc *)0);
                        if (error == 0) {
                                UIO_SYSSPACE, IO_NODELOCKED, 
                                tcnp->cn_cred, (int *)0, (struct proc *)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,
                                    dirbuf.dotdot_name[0] != '.' ||
                                    dirbuf.dotdot_name[1] != '.') {
                                        ufs_dirbad(xp, (doff_t)12,


@@ -1097,6 +1180,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, ".."
 };


@@ -1106,9 +1193,13 @@ static struct dirtemplate mastertemplate = {
  */
 int
 ufs_mkdir(ap)
  */
 int
 ufs_mkdir(ap)

-       struct vop_mkdir_args *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;
        USES_VOP_UPDATE;
        USES_VOP_VALLOC;
        USES_VOP_VFREE;


@@ -1117,7 +1208,7 @@ ufs_mkdir(ap)
        register struct componentname *cnp = ap->a_cnp;
        register struct inode *ip, *dp;
        struct vnode *tvp;
        register struct componentname *cnp = ap->a_cnp;
        register struct inode *ip, *dp;
        struct vnode *tvp;

-       struct dirtemplate dirtemplate;
+       struct dirtemplate dirtemplate, *dtp;

        int error;
        int dmode;
 
        int error;
        int dmode;
 


@@ -1174,7 +1265,11 @@ ufs_mkdir(ap)
                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;
        error = vn_rdwr(UIO_WRITE, ITOV(ip), (caddr_t)&dirtemplate,
        dirtemplate.dot_ino = ip->i_number;
        dirtemplate.dotdot_ino = dp->i_number;
        error = vn_rdwr(UIO_WRITE, ITOV(ip), (caddr_t)&dirtemplate,


@@ -1218,7 +1313,12 @@ bad:
  */
 int
 ufs_rmdir(ap)
  */
 int
 ufs_rmdir(ap)

-       struct vop_rmdir_args *ap;
+       struct vop_rmdir_args /* {
+               struct vnodeop_desc *a_desc;
+               struct vnode *a_dvp;
+               struct vnode *a_vp;
+               struct componentname *a_cnp;
+       } */ *ap;

 {
        USES_VOP_TRUNCATE;
        register struct vnode *dvp = ap->a_dvp;
 {
        USES_VOP_TRUNCATE;
        register struct vnode *dvp = ap->a_dvp;


@@ -1273,7 +1373,8 @@ 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, cnp->cn_cred);
+       error = VOP_TRUNCATE(ap->a_vp, (off_t)0, IO_SYNC, cnp->cn_cred,
+           cnp->cn_proc);

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


@@ -1287,18 +1388,33 @@ out:
  */
 int
 ufs_symlink(ap)
  */
 int
 ufs_symlink(ap)

-       struct vop_symlink_args *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;

 {
 {

-       register struct vnode **vpp = ap->a_vpp;
-       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,
            vpp, ap->a_cnp))
                return (error);
 
        if (error = ufs_makeinode(IFLNK | ap->a_vap->va_mode, ap->a_dvp,
            vpp, ap->a_cnp))
                return (error);

-       error = vn_rdwr(UIO_WRITE, *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(*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);
 }
 


@@ -1313,7 +1429,11 @@ ufs_symlink(ap)
  */
 int
 ufs_readdir(ap)
  */
 int
 ufs_readdir(ap)

-       struct vop_readdir_args *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;
 {
        USES_VOP_READ;
        register struct uio *uio = ap->a_uio;


@@ -1326,12 +1446,49 @@ ufs_readdir(ap)
                return (EINVAL);
        uio->uio_resid = count;
        uio->uio_iov->iov_len = count;
                return (EINVAL);
        uio->uio_resid = count;
        uio->uio_iov->iov_len = count;

-       error = VOP_READ(ap->a_vp, uio, 0, ap->a_cred);
+#      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, uio, 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;
        uio->uio_resid += lost;

-       if ((VTOI(ap->a_vp)->i_size - uio->uio_offset) <= 0)
-               *ap->a_eofflagp = 1;
-       else
-               *ap->a_eofflagp = 0;

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


@@ -1340,11 +1497,21 @@ ufs_readdir(ap)
  */
 int
 ufs_readlink(ap)
  */
 int
 ufs_readlink(ap)

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

 {
 {

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

        USES_VOP_READ;
 
        USES_VOP_READ;
 

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

 }
 
 /*
 }
 
 /*


@@ -1354,7 +1521,10 @@ ufs_readlink(ap)
 /* ARGSUSED */
 int
 ufs_abortop(ap)
 /* ARGSUSED */
 int
 ufs_abortop(ap)

-       struct vop_abortop_args *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);


@@ -1366,7 +1536,9 @@ ufs_abortop(ap)
  */
 int
 ufs_lock(ap)
  */
 int
 ufs_lock(ap)

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

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


@@ -1379,7 +1551,9 @@ ufs_lock(ap)
  */
 int
 ufs_unlock(ap)
  */
 int
 ufs_unlock(ap)

-       struct vop_unlock_args *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);
 


@@ -1394,7 +1568,9 @@ ufs_unlock(ap)
  */
 int
 ufs_islocked(ap)
  */
 int
 ufs_islocked(ap)

-       struct vop_islocked_args *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)


@@ -1408,7 +1584,9 @@ ufs_islocked(ap)
  */
 int
 ufs_strategy(ap)
  */
 int
 ufs_strategy(ap)

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

 {
        USES_VOP_BMAP;
        register struct buf *bp = ap->a_bp;
 {
        USES_VOP_BMAP;
        register struct buf *bp = ap->a_bp;


@@ -1445,7 +1623,9 @@ ufs_strategy(ap)
  */
 int
 ufs_print(ap)
  */
 int
 ufs_print(ap)

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

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


@@ -1471,7 +1651,12 @@ ufs_print(ap)
  */
 int
 ufsspec_read(ap)
  */
 int
 ufsspec_read(ap)

-       struct vop_read_args *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)();
 
 {
        extern int (**spec_vnodeop_p)();
 


@@ -1487,7 +1672,12 @@ ufsspec_read(ap)
  */
 int
 ufsspec_write(ap)
  */
 int
 ufsspec_write(ap)

-       struct vop_write_args *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)();
 
 {
        extern int (**spec_vnodeop_p)();
 


@@ -1505,7 +1695,12 @@ ufsspec_write(ap)
  */
 int
 ufsspec_close(ap)
  */
 int
 ufsspec_close(ap)

-       struct vop_close_args *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);
 {
        extern int (**spec_vnodeop_p)();
        register struct inode *ip = VTOI(ap->a_vp);


@@ -1521,7 +1716,12 @@ ufsspec_close(ap)
  */
 int
 ufsfifo_read(ap)
  */
 int
 ufsfifo_read(ap)

-       struct vop_read_args *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)();
 


@@ -1537,7 +1737,12 @@ ufsfifo_read(ap)
  */
 int
 ufsfifo_write(ap)
  */
 int
 ufsfifo_write(ap)

-       struct vop_write_args *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)();
 


@@ -1554,7 +1759,12 @@ ufsfifo_write(ap)
  * Update the times on the inode then do device close.
  */
 ufsfifo_close(ap)
  * Update the times on the inode then do device close.
  */
 ufsfifo_close(ap)

-       struct vop_close_args *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);


@@ -1570,7 +1780,13 @@ ufsfifo_close(ap)
  */
 int
 ufs_advlock(ap)
  */
 int
 ufs_advlock(ap)

-       struct vop_advlock_args *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 flock *fl = ap->a_fl;
 {
        register struct inode *ip = VTOI(ap->a_vp);
        register struct flock *fl = ap->a_fl;