4.4BSD snapshot (revision 8.1); add 1993 to copyright
[unix-history] / usr / src / sys / nfs / nfs_vnops.c
index 2a9a916..03b383c 100644 (file)
 /*
 /*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%
  *
  *
- *     @(#)nfs_vnops.c 7.17 (Berkeley) %G%
+ *     @(#)nfs_vnops.c 8.1 (Berkeley) %G%
  */
 
 /*
  * vnode op calls for sun nfs version 2
  */
 
  */
 
 /*
  * vnode op calls for sun nfs version 2
  */
 
-#include "machine/pte.h"
-#include "machine/mtpr.h"
-#include "strings.h"
-#include "param.h"
-#include "user.h"
-#include "proc.h"
-#include "mount.h"
-#include "buf.h"
-#include "vm.h"
-#include "../ufs/dir.h"
-#include "malloc.h"
-#include "mbuf.h"
-#include "uio.h"
-#include "ucred.h"
-#include "namei.h"
-#include "errno.h"
-#include "file.h"
-#include "conf.h"
-#include "vnode.h"
-#include "../ufs/inode.h"
-#include "map.h"
-#include "nfsv2.h"
-#include "nfs.h"
-#include "nfsnode.h"
-#include "nfsmount.h"
-#include "xdr_subs.h"
-#include "nfsm_subs.h"
-#include "nfsiom.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
+#include <sys/mount.h>
+#include <sys/buf.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/conf.h>
+#include <sys/namei.h>
+#include <sys/vnode.h>
+#include <sys/map.h>
+#include <sys/dirent.h>
+
+#include <vm/vm.h>
+
+#include <miscfs/specfs/specdev.h>
+#include <miscfs/fifofs/fifo.h>
+
+#include <nfs/rpcv2.h>
+#include <nfs/nfsv2.h>
+#include <nfs/nfs.h>
+#include <nfs/nfsnode.h>
+#include <nfs/nfsmount.h>
+#include <nfs/xdr_subs.h>
+#include <nfs/nfsm_subs.h>
+#include <nfs/nqnfs.h>
 
 /* Defs */
 #define        TRUE    1
 #define        FALSE   0
 
 
 /* Defs */
 #define        TRUE    1
 #define        FALSE   0
 
-/* Global vars */
-int    nfs_lookup(),
-       nfs_create(),
-       nfs_mknod(),
-       nfs_open(),
-       nfs_close(),
-       nfs_access(),
-       nfs_getattr(),
-       nfs_setattr(),
-       nfs_read(),
-       nfs_write(),
-       vfs_noop(),
-       vfs_nullop(),
-       nfs_remove(),
-       nfs_link(),
-       nfs_rename(),
-       nfs_mkdir(),
-       nfs_rmdir(),
-       nfs_symlink(),
-       nfs_readdir(),
-       nfs_readlink(),
-       nfs_abortop(),
-       nfs_lock(),
-       nfs_unlock(),
-       nfs_bmap(),
-       nfs_strategy(),
-       nfs_fsync(),
-       nfs_inactive(),
-       nfs_reclaim(),
-       nfs_print();
-
-struct vnodeops nfsv2_vnodeops = {
-       nfs_lookup,             /* lookup */
-       nfs_create,             /* create */
-       nfs_mknod,              /* mknod */
-       nfs_open,               /* open */
-       nfs_close,              /* close */
-       nfs_access,             /* access */
-       nfs_getattr,            /* getattr */
-       nfs_setattr,            /* setattr */
-       nfs_read,               /* read */
-       nfs_write,              /* write */
-       vfs_noop,               /* ioctl */
-       vfs_noop,               /* select */
-       vfs_noop,               /* mmap */
-       nfs_fsync,              /* fsync */
-       vfs_nullop,             /* seek */
-       nfs_remove,             /* remove */
-       nfs_link,               /* link */
-       nfs_rename,             /* rename */
-       nfs_mkdir,              /* mkdir */
-       nfs_rmdir,              /* rmdir */
-       nfs_symlink,            /* symlink */
-       nfs_readdir,            /* readdir */
-       nfs_readlink,           /* readlink */
-       nfs_abortop,            /* abortop */
-       nfs_inactive,           /* inactive */
-       nfs_reclaim,            /* reclaim */
-       nfs_lock,               /* lock */
-       nfs_unlock,             /* unlock */
-       nfs_bmap,               /* bmap */
-       nfs_strategy,           /* strategy */
-       nfs_print,              /* print */
+/*
+ * Global vfs data structures for nfs
+ */
+int (**nfsv2_vnodeop_p)();
+struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
+       { &vop_default_desc, vn_default_error },
+       { &vop_lookup_desc, nfs_lookup },       /* lookup */
+       { &vop_create_desc, nfs_create },       /* create */
+       { &vop_mknod_desc, nfs_mknod },         /* mknod */
+       { &vop_open_desc, nfs_open },           /* open */
+       { &vop_close_desc, nfs_close },         /* close */
+       { &vop_access_desc, nfs_access },       /* access */
+       { &vop_getattr_desc, nfs_getattr },     /* getattr */
+       { &vop_setattr_desc, nfs_setattr },     /* setattr */
+       { &vop_read_desc, nfs_read },           /* read */
+       { &vop_write_desc, nfs_write },         /* write */
+       { &vop_ioctl_desc, nfs_ioctl },         /* ioctl */
+       { &vop_select_desc, nfs_select },       /* select */
+       { &vop_mmap_desc, nfs_mmap },           /* mmap */
+       { &vop_fsync_desc, nfs_fsync },         /* fsync */
+       { &vop_seek_desc, nfs_seek },           /* seek */
+       { &vop_remove_desc, nfs_remove },       /* remove */
+       { &vop_link_desc, nfs_link },           /* link */
+       { &vop_rename_desc, nfs_rename },       /* rename */
+       { &vop_mkdir_desc, nfs_mkdir },         /* mkdir */
+       { &vop_rmdir_desc, nfs_rmdir },         /* rmdir */
+       { &vop_symlink_desc, nfs_symlink },     /* symlink */
+       { &vop_readdir_desc, nfs_readdir },     /* readdir */
+       { &vop_readlink_desc, nfs_readlink },   /* readlink */
+       { &vop_abortop_desc, nfs_abortop },     /* abortop */
+       { &vop_inactive_desc, nfs_inactive },   /* inactive */
+       { &vop_reclaim_desc, nfs_reclaim },     /* reclaim */
+       { &vop_lock_desc, nfs_lock },           /* lock */
+       { &vop_unlock_desc, nfs_unlock },       /* unlock */
+       { &vop_bmap_desc, nfs_bmap },           /* bmap */
+       { &vop_strategy_desc, nfs_strategy },   /* strategy */
+       { &vop_print_desc, nfs_print },         /* print */
+       { &vop_islocked_desc, nfs_islocked },   /* islocked */
+       { &vop_pathconf_desc, nfs_pathconf },   /* pathconf */
+       { &vop_advlock_desc, nfs_advlock },     /* advlock */
+       { &vop_blkatoff_desc, nfs_blkatoff },   /* blkatoff */
+       { &vop_valloc_desc, nfs_valloc },       /* valloc */
+       { &vop_vfree_desc, nfs_vfree },         /* vfree */
+       { &vop_truncate_desc, nfs_truncate },   /* truncate */
+       { &vop_update_desc, nfs_update },       /* update */
+       { &vop_bwrite_desc, vn_bwrite },
+       { (struct vnodeop_desc*)NULL, (int(*)())NULL }
 };
 };
+struct vnodeopv_desc nfsv2_vnodeop_opv_desc =
+       { &nfsv2_vnodeop_p, nfsv2_vnodeop_entries };
 
 
-/* Special device vnode ops */
-int    spec_lookup(),
-       spec_open(),
-       spec_read(),
-       spec_write(),
-       spec_strategy(),
-       spec_bmap(),
-       spec_ioctl(),
-       spec_select(),
-       spec_close(),
-       spec_badop(),
-       spec_nullop();
-
-struct vnodeops spec_nfsv2nodeops = {
-       spec_lookup,            /* lookup */
-       spec_badop,             /* create */
-       spec_badop,             /* mknod */
-       spec_open,              /* open */
-       spec_close,             /* close */
-       nfs_access,             /* access */
-       nfs_getattr,            /* getattr */
-       nfs_setattr,            /* setattr */
-       spec_read,              /* read */
-       spec_write,             /* write */
-       spec_ioctl,             /* ioctl */
-       spec_select,            /* select */
-       spec_badop,             /* mmap */
-       spec_nullop,            /* fsync */
-       spec_badop,             /* seek */
-       spec_badop,             /* remove */
-       spec_badop,             /* link */
-       spec_badop,             /* rename */
-       spec_badop,             /* mkdir */
-       spec_badop,             /* rmdir */
-       spec_badop,             /* symlink */
-       spec_badop,             /* readdir */
-       spec_badop,             /* readlink */
-       spec_badop,             /* abortop */
-       nfs_inactive,           /* inactive */
-       nfs_reclaim,            /* reclaim */
-       nfs_lock,               /* lock */
-       nfs_unlock,             /* unlock */
-       spec_bmap,              /* bmap */
-       spec_strategy,          /* strategy */
-       nfs_print,              /* print */
+/*
+ * Special device vnode ops
+ */
+int (**spec_nfsv2nodeop_p)();
+struct vnodeopv_entry_desc spec_nfsv2nodeop_entries[] = {
+       { &vop_default_desc, vn_default_error },
+       { &vop_lookup_desc, spec_lookup },      /* lookup */
+       { &vop_create_desc, spec_create },      /* create */
+       { &vop_mknod_desc, spec_mknod },        /* mknod */
+       { &vop_open_desc, spec_open },          /* open */
+       { &vop_close_desc, nfsspec_close },     /* close */
+       { &vop_access_desc, nfsspec_access },   /* access */
+       { &vop_getattr_desc, nfs_getattr },     /* getattr */
+       { &vop_setattr_desc, nfs_setattr },     /* setattr */
+       { &vop_read_desc, nfsspec_read },       /* read */
+       { &vop_write_desc, nfsspec_write },     /* write */
+       { &vop_ioctl_desc, spec_ioctl },        /* ioctl */
+       { &vop_select_desc, spec_select },      /* select */
+       { &vop_mmap_desc, spec_mmap },          /* mmap */
+       { &vop_fsync_desc, nfs_fsync },         /* fsync */
+       { &vop_seek_desc, spec_seek },          /* seek */
+       { &vop_remove_desc, spec_remove },      /* remove */
+       { &vop_link_desc, spec_link },          /* link */
+       { &vop_rename_desc, spec_rename },      /* rename */
+       { &vop_mkdir_desc, spec_mkdir },        /* mkdir */
+       { &vop_rmdir_desc, spec_rmdir },        /* rmdir */
+       { &vop_symlink_desc, spec_symlink },    /* symlink */
+       { &vop_readdir_desc, spec_readdir },    /* readdir */
+       { &vop_readlink_desc, spec_readlink },  /* readlink */
+       { &vop_abortop_desc, spec_abortop },    /* abortop */
+       { &vop_inactive_desc, nfs_inactive },   /* inactive */
+       { &vop_reclaim_desc, nfs_reclaim },     /* reclaim */
+       { &vop_lock_desc, nfs_lock },           /* lock */
+       { &vop_unlock_desc, nfs_unlock },       /* unlock */
+       { &vop_bmap_desc, spec_bmap },          /* bmap */
+       { &vop_strategy_desc, spec_strategy },  /* strategy */
+       { &vop_print_desc, nfs_print },         /* print */
+       { &vop_islocked_desc, nfs_islocked },   /* islocked */
+       { &vop_pathconf_desc, spec_pathconf },  /* pathconf */
+       { &vop_advlock_desc, spec_advlock },    /* advlock */
+       { &vop_blkatoff_desc, spec_blkatoff },  /* blkatoff */
+       { &vop_valloc_desc, spec_valloc },      /* valloc */
+       { &vop_vfree_desc, spec_vfree },        /* vfree */
+       { &vop_truncate_desc, spec_truncate },  /* truncate */
+       { &vop_update_desc, nfs_update },       /* update */
+       { &vop_bwrite_desc, vn_bwrite },
+       { (struct vnodeop_desc*)NULL, (int(*)())NULL }
 };
 };
+struct vnodeopv_desc spec_nfsv2nodeop_opv_desc =
+       { &spec_nfsv2nodeop_p, spec_nfsv2nodeop_entries };
+
+#ifdef FIFO
+int (**fifo_nfsv2nodeop_p)();
+struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
+       { &vop_default_desc, vn_default_error },
+       { &vop_lookup_desc, fifo_lookup },      /* lookup */
+       { &vop_create_desc, fifo_create },      /* create */
+       { &vop_mknod_desc, fifo_mknod },        /* mknod */
+       { &vop_open_desc, fifo_open },          /* open */
+       { &vop_close_desc, nfsfifo_close },     /* close */
+       { &vop_access_desc, nfsspec_access },   /* access */
+       { &vop_getattr_desc, nfs_getattr },     /* getattr */
+       { &vop_setattr_desc, nfs_setattr },     /* setattr */
+       { &vop_read_desc, nfsfifo_read },       /* read */
+       { &vop_write_desc, nfsfifo_write },     /* write */
+       { &vop_ioctl_desc, fifo_ioctl },        /* ioctl */
+       { &vop_select_desc, fifo_select },      /* select */
+       { &vop_mmap_desc, fifo_mmap },          /* mmap */
+       { &vop_fsync_desc, nfs_fsync },         /* fsync */
+       { &vop_seek_desc, fifo_seek },          /* seek */
+       { &vop_remove_desc, fifo_remove },      /* remove */
+       { &vop_link_desc, fifo_link },          /* link */
+       { &vop_rename_desc, fifo_rename },      /* rename */
+       { &vop_mkdir_desc, fifo_mkdir },        /* mkdir */
+       { &vop_rmdir_desc, fifo_rmdir },        /* rmdir */
+       { &vop_symlink_desc, fifo_symlink },    /* symlink */
+       { &vop_readdir_desc, fifo_readdir },    /* readdir */
+       { &vop_readlink_desc, fifo_readlink },  /* readlink */
+       { &vop_abortop_desc, fifo_abortop },    /* abortop */
+       { &vop_inactive_desc, nfs_inactive },   /* inactive */
+       { &vop_reclaim_desc, nfs_reclaim },     /* reclaim */
+       { &vop_lock_desc, nfs_lock },           /* lock */
+       { &vop_unlock_desc, nfs_unlock },       /* unlock */
+       { &vop_bmap_desc, fifo_bmap },          /* bmap */
+       { &vop_strategy_desc, fifo_badop },     /* strategy */
+       { &vop_print_desc, nfs_print },         /* print */
+       { &vop_islocked_desc, nfs_islocked },   /* islocked */
+       { &vop_pathconf_desc, fifo_pathconf },  /* pathconf */
+       { &vop_advlock_desc, fifo_advlock },    /* advlock */
+       { &vop_blkatoff_desc, fifo_blkatoff },  /* blkatoff */
+       { &vop_valloc_desc, fifo_valloc },      /* valloc */
+       { &vop_vfree_desc, fifo_vfree },        /* vfree */
+       { &vop_truncate_desc, fifo_truncate },  /* truncate */
+       { &vop_update_desc, nfs_update },       /* update */
+       { &vop_bwrite_desc, vn_bwrite },
+       { (struct vnodeop_desc*)NULL, (int(*)())NULL }
+};
+struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc =
+       { &fifo_nfsv2nodeop_p, fifo_nfsv2nodeop_entries };
+#endif /* FIFO */
+
+void nqnfs_clientlease();
 
 
+/*
+ * Global variables
+ */
 extern u_long nfs_procids[NFS_NPROCS];
 extern u_long nfs_procids[NFS_NPROCS];
-extern u_long nfs_prog, nfs_vers;
+extern u_long nfs_prog, nfs_vers, nfs_true, nfs_false;
 extern char nfsiobuf[MAXPHYS+NBPG];
 extern char nfsiobuf[MAXPHYS+NBPG];
-struct map nfsmap[NFS_MSIZ];
-enum vtype v_type[NFLNK+1];
-struct buf nfs_bqueue;         /* Queue head for nfsiod's */
-int nfs_asyncdaemons = 0;
-struct proc *nfs_iodwant[MAX_ASYNCDAEMON];
-static int nfsmap_want = 0;
+struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON];
+int nfs_numasync = 0;
+/* Queue head for nfsiod's */
+struct queue_entry nfs_bufq;
+#define        DIRHDSIZ        (sizeof (struct dirent) - (MAXNAMLEN + 1))
 
 /*
  * nfs null call from vfs.
  */
 
 /*
  * nfs null call from vfs.
  */
-nfs_null(vp, cred)
+int
+nfs_null(vp, cred, procp)
        struct vnode *vp;
        struct ucred *cred;
        struct vnode *vp;
        struct ucred *cred;
+       struct proc *procp;
 {
        caddr_t bpos, dpos;
 {
        caddr_t bpos, dpos;
-       u_long xid;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb;
        
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb;
        
-       nfsm_reqhead(nfs_procids[NFSPROC_NULL], cred, 0);
-       nfsm_request(vp);
+       nfsm_reqhead(vp, NFSPROC_NULL, 0);
+       nfsm_request(vp, NFSPROC_NULL, procp, cred);
        nfsm_reqdone;
        return (error);
 }
 
 /*
  * nfs access vnode op.
        nfsm_reqdone;
        return (error);
 }
 
 /*
  * nfs access vnode op.
- * Essentially just get vattr and then imitate iaccess()
+ * For nfs, just return ok. File accesses may fail later.
+ * For nqnfs, use the access rpc to check accessibility. If file modes are
+ * changed on the server, accesses might still fail later.
  */
  */
-nfs_access(vp, mode, cred)
-       struct vnode *vp;
-       int mode;
-       register struct ucred *cred;
+int
+nfs_access(ap)
+       struct vop_access_args /* {
+               struct vnode *a_vp;
+               int  a_mode;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;
 {
 {
-       register struct vattr *vap;
-       register gid_t *gp;
-       struct vattr vattr;
-       register int i;
-       int error;
+       register struct vnode *vp = ap->a_vp;
+       register u_long *tl;
+       register caddr_t cp;
+       caddr_t bpos, dpos;
+       int error = 0;
+       struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
        /*
 
        /*
-        * If you're the super-user,
-        * you always get access.
+        * For nqnfs, do an access rpc, otherwise you are stuck emulating
+        * ufs_access() locally using the vattr. This may not be correct,
+        * since the server may apply other access criteria such as
+        * client uid-->server uid mapping that we do not know about, but
+        * this is better than just returning anything that is lying about
+        * in the cache.
         */
         */
-       if (cred->cr_uid == 0)
-               return (0);
-       vap = &vattr;
-       if (error = nfs_getattr(vp, vap, cred))
+       if (VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NQNFS) {
+               nfsstats.rpccnt[NQNFSPROC_ACCESS]++;
+               nfsm_reqhead(vp, NQNFSPROC_ACCESS, NFSX_FH + 3 * NFSX_UNSIGNED);
+               nfsm_fhtom(vp);
+               nfsm_build(tl, u_long *, 3 * NFSX_UNSIGNED);
+               if (ap->a_mode & VREAD)
+                       *tl++ = nfs_true;
+               else
+                       *tl++ = nfs_false;
+               if (ap->a_mode & VWRITE)
+                       *tl++ = nfs_true;
+               else
+                       *tl++ = nfs_false;
+               if (ap->a_mode & VEXEC)
+                       *tl = nfs_true;
+               else
+                       *tl = nfs_false;
+               nfsm_request(vp, NQNFSPROC_ACCESS, ap->a_p, ap->a_cred);
+               nfsm_reqdone;
                return (error);
                return (error);
-       /*
-        * Access check is based on only one of owner, group, public.
-        * If not owner, then check group. If not a member of the
-        * group, then check public access.
-        */
-       if (cred->cr_uid != vap->va_uid) {
-               mode >>= 3;
-               gp = cred->cr_groups;
-               for (i = 0; i < cred->cr_ngroups; i++, gp++)
-                       if (vap->va_gid == *gp)
-                               goto found;
-               mode >>= 3;
-found:
-               ;
-       }
-       if ((vap->va_mode & mode) != 0)
-               return (0);
-       return (EACCES);
+       } else
+               return (nfsspec_access(ap));
 }
 
 /*
  * nfs open vnode op
 }
 
 /*
  * nfs open vnode op
- * Just check to see if the type is ok
+ * Check to see if the type is ok
+ * and that deletion is not in progress.
+ * For paged in text files, you will need to flush the page cache
+ * if consistency is lost.
  */
 /* ARGSUSED */
  */
 /* ARGSUSED */
-nfs_open(vp, mode, cred)
-       struct vnode *vp;
-       int mode;
-       struct ucred *cred;
+int
+nfs_open(ap)
+       struct vop_open_args /* {
+               struct vnode *a_vp;
+               int  a_mode;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;
 {
 {
-       register enum vtype vtyp;
+       register struct vnode *vp = ap->a_vp;
+       struct nfsnode *np = VTONFS(vp);
+       struct nfsmount *nmp = VFSTONFS(vp->v_mount);
+       struct vattr vattr;
+       int error;
 
 
-       vtyp = vp->v_type;
-       if (vtyp == VREG || vtyp == VDIR || vtyp == VLNK)
-               return (0);
-       else
+       if (vp->v_type != VREG && vp->v_type != VDIR && vp->v_type != VLNK)
                return (EACCES);
                return (EACCES);
+       if (vp->v_flag & VTEXT) {
+           /*
+            * Get a valid lease. If cached data is stale, flush it.
+            */
+           if (nmp->nm_flag & NFSMNT_NQNFS) {
+               if (NQNFS_CKINVALID(vp, np, NQL_READ)) {
+                   do {
+                       error = nqnfs_getlease(vp, NQL_READ, ap->a_cred, ap->a_p);
+                   } while (error == NQNFS_EXPIRED);
+                   if (error)
+                       return (error);
+                   if (np->n_lrev != np->n_brev ||
+                       (np->n_flag & NQNFSNONCACHE)) {
+                       if ((error = nfs_vinvalbuf(vp, V_SAVE, ap->a_cred,
+                               ap->a_p, 1)) == EINTR)
+                               return (error);
+                       (void) vnode_pager_uncache(vp);
+                       np->n_brev = np->n_lrev;
+                   }
+               }
+           } else {
+               if (np->n_flag & NMODIFIED) {
+                       if ((error = nfs_vinvalbuf(vp, V_SAVE, ap->a_cred,
+                               ap->a_p, 1)) == EINTR)
+                               return (error);
+                       (void) vnode_pager_uncache(vp);
+                       np->n_attrstamp = 0;
+                       np->n_direofoffset = 0;
+                       if (error = VOP_GETATTR(vp, &vattr, ap->a_cred, ap->a_p))
+                               return (error);
+                       np->n_mtime = vattr.va_mtime.ts_sec;
+               } else {
+                       if (error = VOP_GETATTR(vp, &vattr, ap->a_cred, ap->a_p))
+                               return (error);
+                       if (np->n_mtime != vattr.va_mtime.ts_sec) {
+                               np->n_direofoffset = 0;
+                               if ((error = nfs_vinvalbuf(vp, V_SAVE,
+                                       ap->a_cred, ap->a_p, 1)) == EINTR)
+                                       return (error);
+                               (void) vnode_pager_uncache(vp);
+                               np->n_mtime = vattr.va_mtime.ts_sec;
+                       }
+               }
+           }
+       } else if ((nmp->nm_flag & NFSMNT_NQNFS) == 0)
+               np->n_attrstamp = 0; /* For Open/Close consistency */
+       return (0);
 }
 
 /*
 }
 
 /*
@@ -265,25 +364,30 @@ nfs_open(vp, mode, cred)
  * For reg files, invalidate any buffer cache entries.
  */
 /* ARGSUSED */
  * For reg files, invalidate any buffer cache entries.
  */
 /* ARGSUSED */
-nfs_close(vp, fflags, cred)
-       register struct vnode *vp;
-       int fflags;
-       struct ucred *cred;
+int
+nfs_close(ap)
+       struct vop_close_args /* {
+               struct vnodeop_desc *a_desc;
+               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 nfsnode *np = VTONFS(vp);
        int error = 0;
 
        register struct nfsnode *np = VTONFS(vp);
        int error = 0;
 
-       if (vp->v_type == VREG && ((np->n_flag & NMODIFIED) ||
-          ((np->n_flag & NBUFFERED) && np->n_sillyrename))) {
-               nfs_lock(vp);
-               np->n_flag &= ~(NMODIFIED|NBUFFERED);
-               error = nfs_blkflush(vp, (daddr_t)0, np->n_size, TRUE);
-               if (np->n_flag & NWRITEERR) {
-                       np->n_flag &= ~NWRITEERR;
-                       if (!error)
-                               error = np->n_error ? np->n_error : EIO;
-               }
-               nfs_unlock(vp);
+       if (vp->v_type == VREG) {
+           if ((VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NQNFS) == 0 &&
+               (np->n_flag & NMODIFIED)) {
+               error = nfs_vinvalbuf(vp, V_SAVE, ap->a_cred, ap->a_p, 1);
+               np->n_attrstamp = 0;
+           }
+           if (np->n_flag & NWRITEERR) {
+               np->n_flag &= ~NWRITEERR;
+               error = np->n_error;
+           }
        }
        return (error);
 }
        }
        return (error);
 }
@@ -291,26 +395,37 @@ nfs_close(vp, fflags, cred)
 /*
  * nfs getattr call from vfs.
  */
 /*
  * nfs getattr call from vfs.
  */
-nfs_getattr(vp, vap, cred)
-       register struct vnode *vp;
-       struct vattr *vap;
-       struct ucred *cred;
+int
+nfs_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 vnode *vp = ap->a_vp;
+       register struct nfsnode *np = VTONFS(vp);
        register caddr_t cp;
        register caddr_t cp;
-       register long t1;
        caddr_t bpos, dpos;
        caddr_t bpos, dpos;
-       u_long xid;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        
-       /* First look in the cache.. */
-       if (nfs_getattrcache(vp, vap) == 0)
+       /*
+        * Update local times for special files.
+        */
+       if (np->n_flag & (NACC | NUPD))
+               np->n_flag |= NCHG;
+       /*
+        * First look in the cache.
+        */
+       if (nfs_getattrcache(vp, ap->a_vap) == 0)
                return (0);
        nfsstats.rpccnt[NFSPROC_GETATTR]++;
                return (0);
        nfsstats.rpccnt[NFSPROC_GETATTR]++;
-       nfsm_reqhead(nfs_procids[NFSPROC_GETATTR], cred, NFSX_FH);
+       nfsm_reqhead(vp, NFSPROC_GETATTR, NFSX_FH);
        nfsm_fhtom(vp);
        nfsm_fhtom(vp);
-       nfsm_request(vp);
-       nfsm_loadattr(vp, vap);
+       nfsm_request(vp, NFSPROC_GETATTR, ap->a_p, ap->a_cred);
+       nfsm_loadattr(vp, ap->a_vap);
        nfsm_reqdone;
        return (error);
 }
        nfsm_reqdone;
        return (error);
 }
@@ -318,50 +433,91 @@ nfs_getattr(vp, vap, cred)
 /*
  * nfs setattr call.
  */
 /*
  * nfs setattr call.
  */
-nfs_setattr(vp, vap, cred)
-       register struct vnode *vp;
-       register struct vattr *vap;
-       struct ucred *cred;
+int
+nfs_setattr(ap)
+       struct vop_setattr_args /* {
+               struct vnodeop_desc *a_desc;
+               struct vnode *a_vp;
+               struct vattr *a_vap;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;
 {
        register struct nfsv2_sattr *sp;
        register caddr_t cp;
        register long t1;
 {
        register struct nfsv2_sattr *sp;
        register caddr_t cp;
        register long t1;
-       caddr_t bpos, dpos;
-       u_long xid;
-       int error = 0;
+       caddr_t bpos, dpos, cp2;
+       u_long *tl;
+       int error = 0, isnq;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
-       struct nfsnode *np;
-
+       register struct vnode *vp = ap->a_vp;
+       register struct nfsnode *np = VTONFS(vp);
+       register struct vattr *vap = ap->a_vap;
+       u_quad_t frev, tsize;
+
+       if (vap->va_size != VNOVAL || vap->va_mtime.ts_sec != VNOVAL ||
+               vap->va_atime.ts_sec != VNOVAL) {
+               if (vap->va_size != VNOVAL) {
+                       if (np->n_flag & NMODIFIED) {
+                           if (vap->va_size == 0)
+                               error = nfs_vinvalbuf(vp, 0, ap->a_cred,
+                                       ap->a_p, 1);
+                           else
+                               error = nfs_vinvalbuf(vp, V_SAVE, ap->a_cred,
+                                       ap->a_p, 1);
+                           if (error)
+                               return (error);
+                       }
+                       tsize = np->n_size;
+                       np->n_size = np->n_vattr.va_size = vap->va_size;
+                       vnode_pager_setsize(vp, (u_long)np->n_size);
+               } else if ((np->n_flag & NMODIFIED) &&
+                       (error = nfs_vinvalbuf(vp, V_SAVE, ap->a_cred,
+                        ap->a_p, 1)) == EINTR)
+                       return (error);
+       }
        nfsstats.rpccnt[NFSPROC_SETATTR]++;
        nfsstats.rpccnt[NFSPROC_SETATTR]++;
-       nfsm_reqhead(nfs_procids[NFSPROC_SETATTR], cred, NFSX_FH+NFSX_SATTR);
+       isnq = (VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NQNFS);
+       nfsm_reqhead(vp, NFSPROC_SETATTR, NFSX_FH+NFSX_SATTR(isnq));
        nfsm_fhtom(vp);
        nfsm_fhtom(vp);
-       nfsm_build(sp, struct nfsv2_sattr *, NFSX_SATTR);
-       if (vap->va_mode == 0xffff)
+       nfsm_build(sp, struct nfsv2_sattr *, NFSX_SATTR(isnq));
+       if (vap->va_mode == (u_short)-1)
                sp->sa_mode = VNOVAL;
        else
                sp->sa_mode = vtonfs_mode(vp->v_type, vap->va_mode);
                sp->sa_mode = VNOVAL;
        else
                sp->sa_mode = vtonfs_mode(vp->v_type, vap->va_mode);
-       if (vap->va_uid == 0xffff)
+       if (vap->va_uid == (uid_t)-1)
                sp->sa_uid = VNOVAL;
        else
                sp->sa_uid = txdr_unsigned(vap->va_uid);
                sp->sa_uid = VNOVAL;
        else
                sp->sa_uid = txdr_unsigned(vap->va_uid);
-       if (vap->va_gid == 0xffff)
+       if (vap->va_gid == (gid_t)-1)
                sp->sa_gid = VNOVAL;
        else
                sp->sa_gid = txdr_unsigned(vap->va_gid);
                sp->sa_gid = VNOVAL;
        else
                sp->sa_gid = txdr_unsigned(vap->va_gid);
-       sp->sa_size = txdr_unsigned(vap->va_size);
-       if (vap->va_size != VNOVAL) {
-               np = VTONFS(vp);
-               if (np->n_flag & NMODIFIED) {
-                       np->n_flag &= ~NMODIFIED;
-                       nfs_blkflush(vp, (daddr_t)0, np->n_size, TRUE);
-               }
+       if (isnq) {
+               txdr_hyper(&vap->va_size, &sp->sa_nqsize);
+               txdr_nqtime(&vap->va_atime, &sp->sa_nqatime);
+               txdr_nqtime(&vap->va_mtime, &sp->sa_nqmtime);
+               sp->sa_nqflags = txdr_unsigned(vap->va_flags);
+               sp->sa_nqrdev = VNOVAL;
+       } else {
+               sp->sa_nfssize = txdr_unsigned(vap->va_size);
+               txdr_nfstime(&vap->va_atime, &sp->sa_nfsatime);
+               txdr_nfstime(&vap->va_mtime, &sp->sa_nfsmtime);
        }
        }
-       txdr_time(&vap->va_atime, &sp->sa_atime);
-       txdr_time(&vap->va_mtime, &sp->sa_mtime);
-       nfsm_request(vp);
+       nfsm_request(vp, NFSPROC_SETATTR, ap->a_p, ap->a_cred);
        nfsm_loadattr(vp, (struct vattr *)0);
        nfsm_loadattr(vp, (struct vattr *)0);
-       /* should we fill in any vap fields ?? */
+       if ((VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NQNFS) &&
+           NQNFS_CKCACHABLE(vp, NQL_WRITE)) {
+               nfsm_dissect(tl, u_long *, 2*NFSX_UNSIGNED);
+               fxdr_hyper(tl, &frev);
+               if (frev > np->n_brev)
+                       np->n_brev = frev;
+       }
        nfsm_reqdone;
        nfsm_reqdone;
+       if (error) {
+               np->n_size = np->n_vattr.va_size = tsize;
+               vnode_pager_setsize(vp, (u_long)np->n_size);
+       }
        return (error);
 }
 
        return (error);
 }
 
@@ -370,195 +526,261 @@ nfs_setattr(vp, vap, cred)
  * First look in cache
  * If not found, unlock the directory nfsnode and do the rpc
  */
  * First look in cache
  * If not found, unlock the directory nfsnode and do the rpc
  */
-nfs_lookup(vp, ndp)
-       register struct vnode *vp;
-       register struct nameidata *ndp;
+int
+nfs_lookup(ap)
+       struct vop_lookup_args /* {
+               struct vnodeop_desc *a_desc;
+               struct vnode *a_dvp;
+               struct vnode **a_vpp;
+               struct componentname *a_cnp;
+       } */ *ap;
 {
 {
+       register struct componentname *cnp = ap->a_cnp;
+       register struct vnode *dvp = ap->a_dvp;
+       register struct vnode **vpp = ap->a_vpp;
+       register int flags = cnp->cn_flags;
        register struct vnode *vdp;
        register struct vnode *vdp;
-       register u_long *p;
+       register u_long *tl;
        register caddr_t cp;
        register long t1, t2;
        register caddr_t cp;
        register long t1, t2;
+       struct nfsmount *nmp;
+       struct nfsnode *tp;
        caddr_t bpos, dpos, cp2;
        caddr_t bpos, dpos, cp2;
-       u_long xid;
+       time_t reqtime;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        struct vnode *newvp;
        long len;
        nfsv2fh_t *fhp;
        struct nfsnode *np;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        struct vnode *newvp;
        long len;
        nfsv2fh_t *fhp;
        struct nfsnode *np;
-       int lockparent, wantparent, flag, error = 0;
+       int lockparent, wantparent, error = 0;
+       int nqlflag, cachable;
+       u_quad_t frev;
 
 
-       ndp->ni_dvp = vp;
-       ndp->ni_vp = NULL;
-       if (vp->v_type != VDIR)
+       *vpp = NULL;
+       if (dvp->v_type != VDIR)
                return (ENOTDIR);
                return (ENOTDIR);
-       lockparent = ndp->ni_nameiop & LOCKPARENT;
-       flag = ndp->ni_nameiop & OPFLAG;
-       wantparent = ndp->ni_nameiop & (LOCKPARENT|WANTPARENT);
-       if ((error = cache_lookup(ndp)) && error != ENOENT) {
+       lockparent = flags & LOCKPARENT;
+       wantparent = flags & (LOCKPARENT|WANTPARENT);
+       nmp = VFSTONFS(dvp->v_mount);
+       np = VTONFS(dvp);
+       if ((error = cache_lookup(dvp, vpp, cnp)) && error != ENOENT) {
                struct vattr vattr;
                int vpid;
 
                struct vattr vattr;
                int vpid;
 
-               if (vp == ndp->ni_rdir && ndp->ni_isdotdot)
-                       panic("nfs_lookup: .. through root");
-               vdp = ndp->ni_vp;
+               vdp = *vpp;
                vpid = vdp->v_id;
                /*
                 * See the comment starting `Step through' in ufs/ufs_lookup.c
                 * for an explanation of the locking protocol
                 */
                vpid = vdp->v_id;
                /*
                 * See the comment starting `Step through' in ufs/ufs_lookup.c
                 * for an explanation of the locking protocol
                 */
-               if (vp == vdp) {
+               if (dvp == vdp) {
                        VREF(vdp);
                        error = 0;
                        VREF(vdp);
                        error = 0;
-               } else if (ndp->ni_isdotdot) {
-                       nfs_unlock(vp);
+               } else
                        error = vget(vdp);
                        error = vget(vdp);
-               } else {
-                       error = vget(vdp);
-                       nfs_unlock(vp);
-               }
                if (!error) {
                if (!error) {
-                       if (vpid == vdp->v_id &&
-                          !nfs_getattr(vdp, &vattr, ndp->ni_cred)) {
+                       if (vpid == vdp->v_id) {
+                          if (nmp->nm_flag & NFSMNT_NQNFS) {
+                               if ((nmp->nm_flag & NFSMNT_NQLOOKLEASE) == 0) {
+                                       nfsstats.lookupcache_hits++;
+                                       if (cnp->cn_nameiop != LOOKUP &&
+                                           (flags & ISLASTCN))
+                                           cnp->cn_flags |= SAVENAME;
+                                       return (0);
+                               } else if (NQNFS_CKCACHABLE(dvp, NQL_READ)) {
+                                       if (np->n_lrev != np->n_brev ||
+                                           (np->n_flag & NMODIFIED)) {
+                                               np->n_direofoffset = 0;
+                                               cache_purge(dvp);
+                                               error = nfs_vinvalbuf(dvp, 0,
+                                                   cnp->cn_cred, cnp->cn_proc,
+                                                   1);
+                                               if (error == EINTR)
+                                                       return (error);
+                                               np->n_brev = np->n_lrev;
+                                       } else {
+                                               nfsstats.lookupcache_hits++;
+                                               if (cnp->cn_nameiop != LOOKUP &&
+                                                   (flags & ISLASTCN))
+                                                   cnp->cn_flags |= SAVENAME;
+                                               return (0);
+                                       }
+                               }
+                          } else if (!VOP_GETATTR(vdp, &vattr, cnp->cn_cred, cnp->cn_proc) &&
+                              vattr.va_ctime.ts_sec == VTONFS(vdp)->n_ctime) {
                                nfsstats.lookupcache_hits++;
                                nfsstats.lookupcache_hits++;
+                               if (cnp->cn_nameiop != LOOKUP &&
+                                   (flags & ISLASTCN))
+                                       cnp->cn_flags |= SAVENAME;
                                return (0);
                                return (0);
-                       } else {
-                               nfs_nput(vdp);
+                          }
+                          cache_purge(vdp);
                        }
                        }
+                       vrele(vdp);
                }
                }
-               nfs_lock(vp);
-               ndp->ni_vp = (struct vnode *)0;
+               *vpp = NULLVP;
        }
        error = 0;
        nfsstats.lookupcache_misses++;
        nfsstats.rpccnt[NFSPROC_LOOKUP]++;
        }
        error = 0;
        nfsstats.lookupcache_misses++;
        nfsstats.rpccnt[NFSPROC_LOOKUP]++;
-       len = ndp->ni_namelen;
-       nfsm_reqhead(nfs_procids[NFSPROC_LOOKUP], ndp->ni_cred, NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(len));
-       nfsm_fhtom(vp);
-       nfsm_strtom(ndp->ni_ptr, len, NFS_MAXNAMLEN);
-       nfsm_request(vp);
+       len = cnp->cn_namelen;
+       nfsm_reqhead(dvp, NFSPROC_LOOKUP, NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(len));
+
+       /*
+        * For nqnfs optionally piggyback a getlease request for the name
+        * being looked up.
+        */
+       if (nmp->nm_flag & NFSMNT_NQNFS) {
+               nfsm_build(tl, u_long *, NFSX_UNSIGNED);
+               if ((nmp->nm_flag & NFSMNT_NQLOOKLEASE) &&
+                   ((cnp->cn_flags & MAKEENTRY) &&
+                   (cnp->cn_nameiop != DELETE || !(flags & ISLASTCN))))
+                       *tl = txdr_unsigned(nmp->nm_leaseterm);
+               else
+                       *tl = 0;
+       }
+       nfsm_fhtom(dvp);
+       nfsm_strtom(cnp->cn_nameptr, len, NFS_MAXNAMLEN);
+       reqtime = time.tv_sec;
+       nfsm_request(dvp, NFSPROC_LOOKUP, cnp->cn_proc, cnp->cn_cred);
 nfsmout:
        if (error) {
 nfsmout:
        if (error) {
-               if ((flag == CREATE || flag == RENAME) &&
-                       *ndp->ni_next == 0) {
-                       if (!lockparent)
-                               nfs_unlock(vp);
-               }
-               return (ENOENT);
+               if ((cnp->cn_nameiop == CREATE || cnp->cn_nameiop == RENAME) &&
+                   (flags & ISLASTCN) && error == ENOENT)
+                       error = EJUSTRETURN;
+               if (cnp->cn_nameiop != LOOKUP && (flags & ISLASTCN))
+                       cnp->cn_flags |= SAVENAME;
+               return (error);
        }
        }
-       nfsm_disect(fhp,nfsv2fh_t *,NFSX_FH);
+       if (nmp->nm_flag & NFSMNT_NQNFS) {
+               nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+               if (*tl) {
+                       nqlflag = fxdr_unsigned(int, *tl);
+                       nfsm_dissect(tl, u_long *, 4*NFSX_UNSIGNED);
+                       cachable = fxdr_unsigned(int, *tl++);
+                       reqtime += fxdr_unsigned(int, *tl++);
+                       fxdr_hyper(tl, &frev);
+               } else
+                       nqlflag = 0;
+       }
+       nfsm_dissect(fhp, nfsv2fh_t *, NFSX_FH);
 
        /*
 
        /*
-        * Handle DELETE and RENAME cases...
+        * Handle RENAME case...
         */
         */
-       if (flag == DELETE && *ndp->ni_next == 0) {
-               if (!bcmp(VTONFS(vp)->n_fh.fh_bytes, (caddr_t)fhp, NFSX_FH)) {
-                       VREF(vp);
-                       newvp = vp;
-                       np = VTONFS(vp);
-               } else {
-                       if (error = nfs_nget(vp->v_mount, fhp, &np)) {
-                               m_freem(mrep);
-                               return (error);
-                       }
-                       newvp = NFSTOV(np);
-               }
-               if (error =
-                   nfs_loadattrcache(&newvp, &md, &dpos, (struct vattr *)0)) {
-                       if (newvp != vp)
-                               nfs_nput(newvp);
-                       else
-                               vrele(vp);
-                       m_freem(mrep);
-                       return (error);
-               }
-               ndp->ni_vp = newvp;
-               if (!lockparent)
-                       nfs_unlock(vp);
-               m_freem(mrep);
-               return (0);
-       }
-
-       if (flag == RENAME && wantparent && *ndp->ni_next == 0) {
-               if (!bcmp(VTONFS(vp)->n_fh.fh_bytes, (caddr_t)fhp, NFSX_FH)) {
+       if (cnp->cn_nameiop == RENAME && wantparent && (flags & ISLASTCN)) {
+               if (!bcmp(np->n_fh.fh_bytes, (caddr_t)fhp, NFSX_FH)) {
                        m_freem(mrep);
                        return (EISDIR);
                }
                        m_freem(mrep);
                        return (EISDIR);
                }
-               if (error = nfs_nget(vp->v_mount, fhp, &np)) {
+               if (error = nfs_nget(dvp->v_mount, fhp, &np)) {
                        m_freem(mrep);
                        return (error);
                }
                newvp = NFSTOV(np);
                if (error =
                    nfs_loadattrcache(&newvp, &md, &dpos, (struct vattr *)0)) {
                        m_freem(mrep);
                        return (error);
                }
                newvp = NFSTOV(np);
                if (error =
                    nfs_loadattrcache(&newvp, &md, &dpos, (struct vattr *)0)) {
-                       nfs_nput(newvp);
+                       vrele(newvp);
                        m_freem(mrep);
                        return (error);
                }
                        m_freem(mrep);
                        return (error);
                }
-               ndp->ni_vp = newvp;
-               if (!lockparent)
-                       nfs_unlock(vp);
+               *vpp = newvp;
+               m_freem(mrep);
+               cnp->cn_flags |= SAVENAME;
                return (0);
        }
 
                return (0);
        }
 
-       if (!bcmp(VTONFS(vp)->n_fh.fh_bytes, (caddr_t)fhp, NFSX_FH)) {
-               VREF(vp);
-               newvp = vp;
-               np = VTONFS(vp);
-       } else if (ndp->ni_isdotdot) {
-               nfs_unlock(vp);
-               if (error = nfs_nget(vp->v_mount, fhp, &np)) {
-                       nfs_lock(vp);
-                       m_freem(mrep);
-                       return (error);
-               }
-               nfs_lock(vp);
-               newvp = NFSTOV(np);
+       if (!bcmp(np->n_fh.fh_bytes, (caddr_t)fhp, NFSX_FH)) {
+               VREF(dvp);
+               newvp = dvp;
        } else {
        } else {
-               if (error = nfs_nget(vp->v_mount, fhp, &np)) {
+               if (error = nfs_nget(dvp->v_mount, fhp, &np)) {
                        m_freem(mrep);
                        return (error);
                }
                newvp = NFSTOV(np);
        }
        if (error = nfs_loadattrcache(&newvp, &md, &dpos, (struct vattr *)0)) {
                        m_freem(mrep);
                        return (error);
                }
                newvp = NFSTOV(np);
        }
        if (error = nfs_loadattrcache(&newvp, &md, &dpos, (struct vattr *)0)) {
-               if (newvp != vp)
-                       nfs_nput(newvp);
-               else
-                       vrele(vp);
+               vrele(newvp);
                m_freem(mrep);
                return (error);
        }
        m_freem(mrep);
                m_freem(mrep);
                return (error);
        }
        m_freem(mrep);
+       *vpp = newvp;
+       if (cnp->cn_nameiop != LOOKUP && (flags & ISLASTCN))
+               cnp->cn_flags |= SAVENAME;
+       if ((cnp->cn_flags & MAKEENTRY) &&
+           (cnp->cn_nameiop != DELETE || !(flags & ISLASTCN))) {
+               if ((nmp->nm_flag & NFSMNT_NQNFS) == 0)
+                       np->n_ctime = np->n_vattr.va_ctime.ts_sec;
+               else if (nqlflag && reqtime > time.tv_sec)
+                       nqnfs_clientlease(nmp, np, nqlflag, cachable, reqtime,
+                               frev);
+               cache_enter(dvp, *vpp, cnp);
+       }
+       return (0);
+}
 
 
-       if (vp != newvp && (!lockparent || *ndp->ni_next != '\0'))
-               nfs_unlock(vp);
-       ndp->ni_vp = newvp;
-       if (error == 0 && ndp->ni_makeentry)
-               cache_enter(ndp);
-       return (error);
+/*
+ * nfs read call.
+ * Just call nfs_bioread() to do the work.
+ */
+int
+nfs_read(ap)
+       struct vop_read_args /* {
+               struct vnode *a_vp;
+               struct uio *a_uio;
+               int  a_ioflag;
+               struct ucred *a_cred;
+       } */ *ap;
+{
+       register struct vnode *vp = ap->a_vp;
+
+       if (vp->v_type != VREG)
+               return (EPERM);
+       return (nfs_bioread(vp, ap->a_uio, ap->a_ioflag, ap->a_cred));
 }
 
 /*
  * nfs readlink call
  */
 }
 
 /*
  * nfs readlink call
  */
-nfs_readlink(vp, uiop, cred)
+int
+nfs_readlink(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;
+
+       if (vp->v_type != VLNK)
+               return (EPERM);
+       return (nfs_bioread(vp, ap->a_uio, 0, ap->a_cred));
+}
+
+/*
+ * Do a readlink rpc.
+ * Called by nfs_doio() from below the buffer cache.
+ */
+int
+nfs_readlinkrpc(vp, uiop, cred)
        register struct vnode *vp;
        struct uio *uiop;
        struct ucred *cred;
 {
        register struct vnode *vp;
        struct uio *uiop;
        struct ucred *cred;
 {
-       register u_long *p;
+       register u_long *tl;
        register caddr_t cp;
        register long t1;
        caddr_t bpos, dpos, cp2;
        register caddr_t cp;
        register long t1;
        caddr_t bpos, dpos, cp2;
-       u_long xid;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        long len;
 
        nfsstats.rpccnt[NFSPROC_READLINK]++;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        long len;
 
        nfsstats.rpccnt[NFSPROC_READLINK]++;
-       nfsm_reqhead(nfs_procids[NFSPROC_READLINK], cred, NFSX_FH);
+       nfsm_reqhead(vp, NFSPROC_READLINK, NFSX_FH);
        nfsm_fhtom(vp);
        nfsm_fhtom(vp);
-       nfsm_request(vp);
+       nfsm_request(vp, NFSPROC_READLINK, uiop->uio_procp, cred);
        nfsm_strsiz(len, NFS_MAXPATHLEN);
        nfsm_mtouio(uiop, len);
        nfsm_reqdone;
        nfsm_strsiz(len, NFS_MAXPATHLEN);
        nfsm_mtouio(uiop, len);
        nfsm_reqdone;
@@ -566,35 +788,44 @@ nfs_readlink(vp, uiop, cred)
 }
 
 /*
 }
 
 /*
- * nfs read call
+ * nfs read rpc call
+ * Ditto above
  */
  */
+int
 nfs_readrpc(vp, uiop, cred)
        register struct vnode *vp;
        struct uio *uiop;
        struct ucred *cred;
 {
 nfs_readrpc(vp, uiop, cred)
        register struct vnode *vp;
        struct uio *uiop;
        struct ucred *cred;
 {
-       register u_long *p;
+       register u_long *tl;
        register caddr_t cp;
        register long t1;
        caddr_t bpos, dpos, cp2;
        register caddr_t cp;
        register long t1;
        caddr_t bpos, dpos, cp2;
-       u_long xid;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        struct nfsmount *nmp;
        long len, retlen, tsiz;
 
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        struct nfsmount *nmp;
        long len, retlen, tsiz;
 
-       nmp = vfs_to_nfs(vp->v_mount);
+       nmp = VFSTONFS(vp->v_mount);
        tsiz = uiop->uio_resid;
        tsiz = uiop->uio_resid;
+       if (uiop->uio_offset + tsiz > 0xffffffff &&
+           (nmp->nm_flag & NFSMNT_NQNFS) == 0)
+               return (EFBIG);
        while (tsiz > 0) {
                nfsstats.rpccnt[NFSPROC_READ]++;
                len = (tsiz > nmp->nm_rsize) ? nmp->nm_rsize : tsiz;
        while (tsiz > 0) {
                nfsstats.rpccnt[NFSPROC_READ]++;
                len = (tsiz > nmp->nm_rsize) ? nmp->nm_rsize : tsiz;
-               nfsm_reqhead(nfs_procids[NFSPROC_READ], cred, NFSX_FH+NFSX_UNSIGNED*3);
+               nfsm_reqhead(vp, NFSPROC_READ, NFSX_FH+NFSX_UNSIGNED*3);
                nfsm_fhtom(vp);
                nfsm_fhtom(vp);
-               nfsm_build(p, u_long *, NFSX_UNSIGNED*3);
-               *p++ = txdr_unsigned(uiop->uio_offset);
-               *p++ = txdr_unsigned(len);
-               *p = 0;
-               nfsm_request(vp);
+               nfsm_build(tl, u_long *, NFSX_UNSIGNED*3);
+               if (nmp->nm_flag & NFSMNT_NQNFS) {
+                       txdr_hyper(&uiop->uio_offset, tl);
+                       *(tl + 2) = txdr_unsigned(len);
+               } else {
+                       *tl++ = txdr_unsigned(uiop->uio_offset);
+                       *tl++ = txdr_unsigned(len);
+                       *tl = 0;
+               }
+               nfsm_request(vp, NFSPROC_READ, uiop->uio_procp, cred);
                nfsm_loadattr(vp, (struct vattr *)0);
                nfsm_strsiz(retlen, nmp->nm_rsize);
                nfsm_mtouio(uiop, retlen);
                nfsm_loadattr(vp, (struct vattr *)0);
                nfsm_strsiz(retlen, nmp->nm_rsize);
                nfsm_mtouio(uiop, retlen);
@@ -611,369 +842,652 @@ nfsmout:
 /*
  * nfs write call
  */
 /*
  * nfs write call
  */
-nfs_writerpc(vp, uiop, cred)
+int
+nfs_writerpc(vp, uiop, cred, ioflags)
        register struct vnode *vp;
        struct uio *uiop;
        struct ucred *cred;
        register struct vnode *vp;
        struct uio *uiop;
        struct ucred *cred;
+       int ioflags;
 {
 {
-       register u_long *p;
+       register u_long *tl;
        register caddr_t cp;
        register long t1;
        register caddr_t cp;
        register long t1;
-       caddr_t bpos, dpos;
-       u_long xid;
+       caddr_t bpos, dpos, cp2;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        struct nfsmount *nmp;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        struct nfsmount *nmp;
+       struct nfsnode *np = VTONFS(vp);
+       u_quad_t frev;
        long len, tsiz;
 
        long len, tsiz;
 
-       nmp = vfs_to_nfs(vp->v_mount);
+       nmp = VFSTONFS(vp->v_mount);
        tsiz = uiop->uio_resid;
        tsiz = uiop->uio_resid;
+       if (uiop->uio_offset + tsiz > 0xffffffff &&
+           (nmp->nm_flag & NFSMNT_NQNFS) == 0)
+               return (EFBIG);
        while (tsiz > 0) {
                nfsstats.rpccnt[NFSPROC_WRITE]++;
                len = (tsiz > nmp->nm_wsize) ? nmp->nm_wsize : tsiz;
        while (tsiz > 0) {
                nfsstats.rpccnt[NFSPROC_WRITE]++;
                len = (tsiz > nmp->nm_wsize) ? nmp->nm_wsize : tsiz;
-               nfsm_reqhead(nfs_procids[NFSPROC_WRITE], cred,
-                       NFSX_FH+NFSX_UNSIGNED*4);
+               nfsm_reqhead(vp, NFSPROC_WRITE,
+                       NFSX_FH+NFSX_UNSIGNED*4+nfsm_rndup(len));
                nfsm_fhtom(vp);
                nfsm_fhtom(vp);
-               nfsm_build(p, u_long *, NFSX_UNSIGNED*4);
-               *(p+1) = txdr_unsigned(uiop->uio_offset);
-               *(p+3) = txdr_unsigned(len);
+               nfsm_build(tl, u_long *, NFSX_UNSIGNED * 4);
+               if (nmp->nm_flag & NFSMNT_NQNFS) {
+                       txdr_hyper(&uiop->uio_offset, tl);
+                       tl += 2;
+                       if (ioflags & IO_APPEND)
+                               *tl++ = txdr_unsigned(1);
+                       else
+                               *tl++ = 0;
+               } else {
+                       *++tl = txdr_unsigned(uiop->uio_offset);
+                       tl += 2;
+               }
+               *tl = txdr_unsigned(len);
                nfsm_uiotom(uiop, len);
                nfsm_uiotom(uiop, len);
-               nfsm_request(vp);
+               nfsm_request(vp, NFSPROC_WRITE, uiop->uio_procp, cred);
                nfsm_loadattr(vp, (struct vattr *)0);
                nfsm_loadattr(vp, (struct vattr *)0);
+               if (nmp->nm_flag & NFSMNT_MYWRITE)
+                       VTONFS(vp)->n_mtime = VTONFS(vp)->n_vattr.va_mtime.ts_sec;
+               else if ((nmp->nm_flag & NFSMNT_NQNFS) &&
+                        NQNFS_CKCACHABLE(vp, NQL_WRITE)) {
+                       nfsm_dissect(tl, u_long *, 2*NFSX_UNSIGNED);
+                       fxdr_hyper(tl, &frev);
+                       if (frev > np->n_brev)
+                               np->n_brev = frev;
+               }
                m_freem(mrep);
                tsiz -= len;
        }
 nfsmout:
                m_freem(mrep);
                tsiz -= len;
        }
 nfsmout:
+       if (error)
+               uiop->uio_resid = tsiz;
        return (error);
 }
 
 /*
  * nfs mknod call
        return (error);
 }
 
 /*
  * nfs mknod call
- * This call is currently not supported.
+ * This is a kludge. Use a create rpc but with the IFMT bits of the mode
+ * set to specify the file type and the size field for rdev.
  */
 /* ARGSUSED */
  */
 /* ARGSUSED */
-nfs_mknod(ndp, vap, cred)
-       struct nameidata *ndp;
-       struct ucred *cred;
-       struct vattr *vap;
+int
+nfs_mknod(ap)
+       struct vop_mknod_args /* {
+               struct vnode *a_dvp;
+               struct vnode **a_vpp;
+               struct componentname *a_cnp;
+               struct vattr *a_vap;
+       } */ *ap;
 {
 {
-
-       nfs_abortop(ndp);
-       return (EOPNOTSUPP);
+       register struct vnode *dvp = ap->a_dvp;
+       register struct vattr *vap = ap->a_vap;
+       register struct componentname *cnp = ap->a_cnp;
+       register struct nfsv2_sattr *sp;
+       register u_long *tl;
+       register caddr_t cp;
+       register long t1, t2;
+       struct vnode *newvp;
+       struct vattr vattr;
+       char *cp2;
+       caddr_t bpos, dpos;
+       int error = 0, isnq;
+       struct mbuf *mreq, *mrep, *md, *mb, *mb2;
+       u_long rdev;
+
+       isnq = (VFSTONFS(dvp->v_mount)->nm_flag & NFSMNT_NQNFS);
+       if (vap->va_type == VCHR || vap->va_type == VBLK)
+               rdev = txdr_unsigned(vap->va_rdev);
+#ifdef FIFO
+       else if (vap->va_type == VFIFO)
+               rdev = 0xffffffff;
+#endif /* FIFO */
+       else {
+               VOP_ABORTOP(dvp, cnp);
+               vput(dvp);
+               return (EOPNOTSUPP);
+       }
+       if (error = VOP_GETATTR(dvp, &vattr, cnp->cn_cred, cnp->cn_proc)) {
+               VOP_ABORTOP(dvp, cnp);
+               vput(dvp);
+               return (error);
+       }
+       nfsstats.rpccnt[NFSPROC_CREATE]++;
+       nfsm_reqhead(dvp, NFSPROC_CREATE,
+         NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(cnp->cn_namelen)+NFSX_SATTR(isnq));
+       nfsm_fhtom(dvp);
+       nfsm_strtom(cnp->cn_nameptr, cnp->cn_namelen, NFS_MAXNAMLEN);
+       nfsm_build(sp, struct nfsv2_sattr *, NFSX_SATTR(isnq));
+       sp->sa_mode = vtonfs_mode(vap->va_type, vap->va_mode);
+       sp->sa_uid = txdr_unsigned(cnp->cn_cred->cr_uid);
+       sp->sa_gid = txdr_unsigned(vattr.va_gid);
+       if (isnq) {
+               sp->sa_nqrdev = rdev;
+               sp->sa_nqflags = 0;
+               txdr_nqtime(&vap->va_atime, &sp->sa_nqatime);
+               txdr_nqtime(&vap->va_mtime, &sp->sa_nqmtime);
+       } else {
+               sp->sa_nfssize = rdev;
+               txdr_nfstime(&vap->va_atime, &sp->sa_nfsatime);
+               txdr_nfstime(&vap->va_mtime, &sp->sa_nfsmtime);
+       }
+       nfsm_request(dvp, NFSPROC_CREATE, cnp->cn_proc, cnp->cn_cred);
+       nfsm_mtofh(dvp, newvp);
+       nfsm_reqdone;
+       if (!error && (cnp->cn_flags & MAKEENTRY))
+               cache_enter(dvp, newvp, cnp);
+       FREE(cnp->cn_pnbuf, M_NAMEI);
+       VTONFS(dvp)->n_flag |= NMODIFIED;
+       vrele(dvp);
+       return (error);
 }
 
 /*
  * nfs file create call
  */
 }
 
 /*
  * nfs file create call
  */
-nfs_create(ndp, vap)
-       register struct nameidata *ndp;
-       register struct vattr *vap;
+int
+nfs_create(ap)
+       struct vop_create_args /* {
+               struct vnode *a_dvp;
+               struct vnode **a_vpp;
+               struct componentname *a_cnp;
+               struct vattr *a_vap;
+       } */ *ap;
 {
 {
+       register struct vnode *dvp = ap->a_dvp;
+       register struct vattr *vap = ap->a_vap;
+       register struct componentname *cnp = ap->a_cnp;
        register struct nfsv2_sattr *sp;
        register struct nfsv2_sattr *sp;
-       register u_long *p;
+       register u_long *tl;
        register caddr_t cp;
        register long t1, t2;
        caddr_t bpos, dpos, cp2;
        register caddr_t cp;
        register long t1, t2;
        caddr_t bpos, dpos, cp2;
-       u_long xid;
-       int error = 0;
+       int error = 0, isnq;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
+       struct vattr vattr;
 
 
+       if (error = VOP_GETATTR(dvp, &vattr, cnp->cn_cred, cnp->cn_proc)) {
+               VOP_ABORTOP(dvp, cnp);
+               vput(dvp);
+               return (error);
+       }
        nfsstats.rpccnt[NFSPROC_CREATE]++;
        nfsstats.rpccnt[NFSPROC_CREATE]++;
-       nfsm_reqhead(nfs_procids[NFSPROC_CREATE], ndp->ni_cred,
-         NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(ndp->ni_dent.d_namlen)+NFSX_SATTR);
-       nfsm_fhtom(ndp->ni_dvp);
-       nfsm_strtom(ndp->ni_dent.d_name, ndp->ni_dent.d_namlen, NFS_MAXNAMLEN);
-       nfsm_build(sp, struct nfsv2_sattr *, NFSX_SATTR);
-       sp->sa_mode = vtonfs_mode(VREG, vap->va_mode);
-       sp->sa_uid = txdr_unsigned(ndp->ni_cred->cr_uid);
-       sp->sa_gid = txdr_unsigned(ndp->ni_cred->cr_gid);
-       sp->sa_size = txdr_unsigned(0);
-       /* or should these be VNOVAL ?? */
-       txdr_time(&vap->va_atime, &sp->sa_atime);
-       txdr_time(&vap->va_mtime, &sp->sa_mtime);
-       nfsm_request(ndp->ni_dvp);
-       nfsm_mtofh(ndp->ni_dvp, ndp->ni_vp);
+       isnq = (VFSTONFS(dvp->v_mount)->nm_flag & NFSMNT_NQNFS);
+       nfsm_reqhead(dvp, NFSPROC_CREATE,
+         NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(cnp->cn_namelen)+NFSX_SATTR(isnq));
+       nfsm_fhtom(dvp);
+       nfsm_strtom(cnp->cn_nameptr, cnp->cn_namelen, NFS_MAXNAMLEN);
+       nfsm_build(sp, struct nfsv2_sattr *, NFSX_SATTR(isnq));
+       sp->sa_mode = vtonfs_mode(vap->va_type, vap->va_mode);
+       sp->sa_uid = txdr_unsigned(cnp->cn_cred->cr_uid);
+       sp->sa_gid = txdr_unsigned(vattr.va_gid);
+       if (isnq) {
+               u_quad_t qval = 0;
+
+               txdr_hyper(&qval, &sp->sa_nqsize);
+               sp->sa_nqflags = 0;
+               sp->sa_nqrdev = -1;
+               txdr_nqtime(&vap->va_atime, &sp->sa_nqatime);
+               txdr_nqtime(&vap->va_mtime, &sp->sa_nqmtime);
+       } else {
+               sp->sa_nfssize = 0;
+               txdr_nfstime(&vap->va_atime, &sp->sa_nfsatime);
+               txdr_nfstime(&vap->va_mtime, &sp->sa_nfsmtime);
+       }
+       nfsm_request(dvp, NFSPROC_CREATE, cnp->cn_proc, cnp->cn_cred);
+       nfsm_mtofh(dvp, *ap->a_vpp);
        nfsm_reqdone;
        nfsm_reqdone;
-       nfs_nput(ndp->ni_dvp);
+       if (!error && (cnp->cn_flags & MAKEENTRY))
+               cache_enter(dvp, *ap->a_vpp, cnp);
+       FREE(cnp->cn_pnbuf, M_NAMEI);
+       VTONFS(dvp)->n_flag |= NMODIFIED;
+       vrele(dvp);
        return (error);
 }
 
 /*
  * nfs file remove call
        return (error);
 }
 
 /*
  * nfs file remove call
- * To try and make nfs semantics closer to vfs semantics, a file that has
- * other references to the vnode is renamed instead of removed and then
+ * To try and make nfs semantics closer to ufs semantics, a file that has
+ * other processes using the vnode is renamed instead of removed and then
  * removed later on the last close.
  * removed later on the last close.
- * Unfortunately you must flush the buffer cache and cmap to get rid of
- * all extraneous vnode references before you check the reference cnt.
- * 1 - If the file could have blocks in the buffer cache
- *       flush them out and invalidate them
- *       mpurge the vnode to flush out cmap references
- *       (This is necessary to update the vnode ref cnt as well as sensible
- *        for actual removes, to free up the buffers)
- * 2 - If v_count > 1
+ * - If v_usecount > 1
  *       If a rename is not already in the works
  *          call nfs_sillyrename() to set it up
  *     else
  *       do the remove rpc
  */
  *       If a rename is not already in the works
  *          call nfs_sillyrename() to set it up
  *     else
  *       do the remove rpc
  */
-nfs_remove(ndp)
-       register struct nameidata *ndp;
+int
+nfs_remove(ap)
+       struct vop_remove_args /* {
+               struct vnodeop_desc *a_desc;
+               struct vnode * a_dvp;
+               struct vnode * a_vp;
+               struct componentname * a_cnp;
+       } */ *ap;
 {
 {
-       register struct vnode *vp = ndp->ni_vp;
-       register struct nfsnode *np = VTONFS(ndp->ni_vp);
-       register u_long *p;
+       register struct vnode *vp = ap->a_vp;
+       register struct vnode *dvp = ap->a_dvp;
+       register struct componentname *cnp = ap->a_cnp;
+       register struct nfsnode *np = VTONFS(vp);
+       register u_long *tl;
        register caddr_t cp;
        register caddr_t cp;
-       register long t1, t2;
+       register long t2;
        caddr_t bpos, dpos;
        caddr_t bpos, dpos;
-       u_long xid;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
-       if (vp->v_type == VREG) {
-               if (np->n_flag & (NMODIFIED|NBUFFERED)) {
-                       np->n_flag &= ~(NMODIFIED|NBUFFERED);
-                       nfs_blkflush(vp, (daddr_t)0, np->n_size, TRUE);
-               }
-               if (np->n_flag & NPAGEDON)
-                       mpurge(vp);     /* In case cmap entries still ref it */
-       }
-       if (vp->v_count > 1) {
+       if (vp->v_usecount > 1) {
                if (!np->n_sillyrename)
                if (!np->n_sillyrename)
-                       error = nfs_sillyrename(ndp, REMOVE);
+                       error = nfs_sillyrename(dvp, vp, cnp);
        } else {
        } else {
+               /*
+                * Purge the name cache so that the chance of a lookup for
+                * the name succeeding while the remove is in progress is
+                * minimized. Without node locking it can still happen, such
+                * that an I/O op returns ESTALE, but since you get this if
+                * another host removes the file..
+                */
+               cache_purge(vp);
+               /*
+                * Throw away biocache buffers. Mainly to avoid
+                * unnecessary delayed writes.
+                */
+               error = nfs_vinvalbuf(vp, 0, cnp->cn_cred, cnp->cn_proc, 1);
+               if (error == EINTR)
+                       return (error);
+               /* Do the rpc */
                nfsstats.rpccnt[NFSPROC_REMOVE]++;
                nfsstats.rpccnt[NFSPROC_REMOVE]++;
-               nfsm_reqhead(nfs_procids[NFSPROC_REMOVE], ndp->ni_cred,
-                       NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(ndp->ni_dent.d_namlen));
-               nfsm_fhtom(ndp->ni_dvp);
-               nfsm_strtom(ndp->ni_dent.d_name, ndp->ni_dent.d_namlen, NFS_MAXNAMLEN);
-               nfsm_request(ndp->ni_dvp);
+               nfsm_reqhead(dvp, NFSPROC_REMOVE,
+                       NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(cnp->cn_namelen));
+               nfsm_fhtom(dvp);
+               nfsm_strtom(cnp->cn_nameptr, cnp->cn_namelen, NFS_MAXNAMLEN);
+               nfsm_request(dvp, NFSPROC_REMOVE, cnp->cn_proc, cnp->cn_cred);
                nfsm_reqdone;
                nfsm_reqdone;
+               FREE(cnp->cn_pnbuf, M_NAMEI);
+               VTONFS(dvp)->n_flag |= NMODIFIED;
+               /*
+                * Kludge City: If the first reply to the remove rpc is lost..
+                *   the reply to the retransmitted request will be ENOENT
+                *   since the file was in fact removed
+                *   Therefore, we cheat and return success.
+                */
+               if (error == ENOENT)
+                       error = 0;
        }
        }
-       if (ndp->ni_dvp == ndp->ni_vp)
-               vrele(ndp->ni_vp);
-       else
-               nfs_nput(ndp->ni_vp);
-       nfs_nput(ndp->ni_dvp);
+       np->n_attrstamp = 0;
+       vrele(dvp);
+       vrele(vp);
        return (error);
 }
 
 /*
  * nfs file remove rpc called from nfs_inactive
  */
        return (error);
 }
 
 /*
  * nfs file remove rpc called from nfs_inactive
  */
-nfs_removeit(ndp)
-       register struct nameidata *ndp;
+int
+nfs_removeit(sp)
+       register struct sillyrename *sp;
 {
 {
-       register u_long *p;
+       register u_long *tl;
        register caddr_t cp;
        register caddr_t cp;
-       register long t1, t2;
+       register long t2;
        caddr_t bpos, dpos;
        caddr_t bpos, dpos;
-       u_long xid;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
        nfsstats.rpccnt[NFSPROC_REMOVE]++;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
        nfsstats.rpccnt[NFSPROC_REMOVE]++;
-       nfsm_reqhead(nfs_procids[NFSPROC_REMOVE], ndp->ni_cred,
-               NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(ndp->ni_dent.d_namlen));
-       nfsm_fhtom(ndp->ni_dvp);
-       nfsm_strtom(ndp->ni_dent.d_name, ndp->ni_dent.d_namlen, NFS_MAXNAMLEN);
-       nfsm_request(ndp->ni_dvp);
+       nfsm_reqhead(sp->s_dvp, NFSPROC_REMOVE,
+               NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(sp->s_namlen));
+       nfsm_fhtom(sp->s_dvp);
+       nfsm_strtom(sp->s_name, sp->s_namlen, NFS_MAXNAMLEN);
+       nfsm_request(sp->s_dvp, NFSPROC_REMOVE, NULL, sp->s_cred);
        nfsm_reqdone;
        nfsm_reqdone;
+       VTONFS(sp->s_dvp)->n_flag |= NMODIFIED;
        return (error);
 }
 
 /*
  * nfs file rename call
  */
        return (error);
 }
 
 /*
  * nfs file rename call
  */
-nfs_rename(sndp, tndp)
-       register struct nameidata *sndp, *tndp;
+int
+nfs_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;
 {
 {
-       register u_long *p;
+       register struct vnode *fvp = ap->a_fvp;
+       register struct vnode *tvp = ap->a_tvp;
+       register struct vnode *fdvp = ap->a_fdvp;
+       register struct vnode *tdvp = ap->a_tdvp;
+       register struct componentname *tcnp = ap->a_tcnp;
+       register struct componentname *fcnp = ap->a_fcnp;
+       register u_long *tl;
        register caddr_t cp;
        register caddr_t cp;
-       register long t1, t2;
+       register long t2;
        caddr_t bpos, dpos;
        caddr_t bpos, dpos;
-       u_long xid;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
+       /* Check for cross-device rename */
+       if ((fvp->v_mount != tdvp->v_mount) ||
+           (tvp && (fvp->v_mount != tvp->v_mount))) {
+               error = EXDEV;
+               goto out;
+       }
+
+
        nfsstats.rpccnt[NFSPROC_RENAME]++;
        nfsstats.rpccnt[NFSPROC_RENAME]++;
-       nfsm_reqhead(nfs_procids[NFSPROC_RENAME], tndp->ni_cred,
-               (NFSX_FH+NFSX_UNSIGNED)*2+nfsm_rndup(sndp->ni_dent.d_namlen)+
-               nfsm_rndup(tndp->ni_dent.d_namlen)); /* or sndp->ni_cred?*/
-       nfsm_fhtom(sndp->ni_dvp);
-       nfsm_strtom(sndp->ni_dent.d_name,sndp->ni_dent.d_namlen,NFS_MAXNAMLEN);
-       nfsm_fhtom(tndp->ni_dvp);
-       nfsm_strtom(tndp->ni_dent.d_name,tndp->ni_dent.d_namlen,NFS_MAXNAMLEN);
-       nfsm_request(sndp->ni_dvp);
+       nfsm_reqhead(fdvp, NFSPROC_RENAME,
+               (NFSX_FH+NFSX_UNSIGNED)*2+nfsm_rndup(fcnp->cn_namelen)+
+               nfsm_rndup(fcnp->cn_namelen)); /* or fcnp->cn_cred?*/
+       nfsm_fhtom(fdvp);
+       nfsm_strtom(fcnp->cn_nameptr, fcnp->cn_namelen, NFS_MAXNAMLEN);
+       nfsm_fhtom(tdvp);
+       nfsm_strtom(tcnp->cn_nameptr, tcnp->cn_namelen, NFS_MAXNAMLEN);
+       nfsm_request(fdvp, NFSPROC_RENAME, tcnp->cn_proc, tcnp->cn_cred);
        nfsm_reqdone;
        nfsm_reqdone;
-       if (sndp->ni_vp->v_type == VDIR) {
-               if (tndp->ni_vp != NULL && tndp->ni_vp->v_type == VDIR)
-                       cache_purge(tndp->ni_dvp);
-               cache_purge(sndp->ni_dvp);
+       VTONFS(fdvp)->n_flag |= NMODIFIED;
+       VTONFS(tdvp)->n_flag |= NMODIFIED;
+       if (fvp->v_type == VDIR) {
+               if (tvp != NULL && tvp->v_type == VDIR)
+                       cache_purge(tdvp);
+               cache_purge(fdvp);
        }
        }
-       nfs_abortop(sndp);
-       nfs_abortop(tndp);
+out:
+       if (tdvp == tvp)
+               vrele(tdvp);
+       else
+               vput(tdvp);
+       if (tvp)
+               vput(tvp);
+       vrele(fdvp);
+       vrele(fvp);
+       /*
+        * Kludge: Map ENOENT => 0 assuming that it is a reply to a retry.
+        */
+       if (error == ENOENT)
+               error = 0;
        return (error);
 }
 
 /*
        return (error);
 }
 
 /*
- * nfs file rename rpc called from above
+ * nfs file rename rpc called from nfs_remove() above
  */
  */
-nfs_renameit(sndp, tndp)
-       register struct nameidata *sndp, *tndp;
+int
+nfs_renameit(sdvp, scnp, sp)
+       struct vnode *sdvp;
+       struct componentname *scnp;
+       register struct sillyrename *sp;
 {
 {
-       register u_long *p;
+       register u_long *tl;
        register caddr_t cp;
        register caddr_t cp;
-       register long t1, t2;
+       register long t2;
        caddr_t bpos, dpos;
        caddr_t bpos, dpos;
-       u_long xid;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
        nfsstats.rpccnt[NFSPROC_RENAME]++;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
        nfsstats.rpccnt[NFSPROC_RENAME]++;
-       nfsm_reqhead(nfs_procids[NFSPROC_RENAME], tndp->ni_cred,
-               (NFSX_FH+NFSX_UNSIGNED)*2+nfsm_rndup(sndp->ni_dent.d_namlen)+
-               nfsm_rndup(tndp->ni_dent.d_namlen)); /* or sndp->ni_cred?*/
-       nfsm_fhtom(sndp->ni_dvp);
-       nfsm_strtom(sndp->ni_dent.d_name,sndp->ni_dent.d_namlen,NFS_MAXNAMLEN);
-       nfsm_fhtom(tndp->ni_dvp);
-       nfsm_strtom(tndp->ni_dent.d_name,tndp->ni_dent.d_namlen,NFS_MAXNAMLEN);
-       nfsm_request(sndp->ni_dvp);
+       nfsm_reqhead(sdvp, NFSPROC_RENAME,
+               (NFSX_FH+NFSX_UNSIGNED)*2+nfsm_rndup(scnp->cn_namelen)+
+               nfsm_rndup(sp->s_namlen));
+       nfsm_fhtom(sdvp);
+       nfsm_strtom(scnp->cn_nameptr, scnp->cn_namelen, NFS_MAXNAMLEN);
+       nfsm_fhtom(sdvp);
+       nfsm_strtom(sp->s_name, sp->s_namlen, NFS_MAXNAMLEN);
+       nfsm_request(sdvp, NFSPROC_RENAME, scnp->cn_proc, scnp->cn_cred);
        nfsm_reqdone;
        nfsm_reqdone;
+       FREE(scnp->cn_pnbuf, M_NAMEI);
+       VTONFS(sdvp)->n_flag |= NMODIFIED;
        return (error);
 }
 
 /*
  * nfs hard link create call
  */
        return (error);
 }
 
 /*
  * nfs hard link create call
  */
-nfs_link(vp, ndp)
-       register struct vnode *vp;
-       register struct nameidata *ndp;
+int
+nfs_link(ap)
+       struct vop_link_args /* {
+               struct vnode *a_vp;
+               struct vnode *a_tdvp;
+               struct componentname *a_cnp;
+       } */ *ap;
 {
 {
-       register u_long *p;
+       register struct vnode *vp = ap->a_vp;
+       register struct vnode *tdvp = ap->a_tdvp;
+       register struct componentname *cnp = ap->a_cnp;
+       register u_long *tl;
        register caddr_t cp;
        register caddr_t cp;
-       register long t1, t2;
+       register long t2;
        caddr_t bpos, dpos;
        caddr_t bpos, dpos;
-       u_long xid;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
-       if (ndp->ni_dvp != vp)
-               nfs_lock(vp);
+       if (vp->v_mount != tdvp->v_mount) {
+               /*VOP_ABORTOP(vp, cnp);*/
+               if (tdvp == vp)
+                       vrele(vp);
+               else
+                       vput(vp);
+               return (EXDEV);
+       }
+
        nfsstats.rpccnt[NFSPROC_LINK]++;
        nfsstats.rpccnt[NFSPROC_LINK]++;
-       nfsm_reqhead(nfs_procids[NFSPROC_LINK], ndp->ni_cred,
-               NFSX_FH*2+NFSX_UNSIGNED+nfsm_rndup(ndp->ni_dent.d_namlen));
+       nfsm_reqhead(tdvp, NFSPROC_LINK,
+               NFSX_FH*2+NFSX_UNSIGNED+nfsm_rndup(cnp->cn_namelen));
+       nfsm_fhtom(tdvp);
        nfsm_fhtom(vp);
        nfsm_fhtom(vp);
-       nfsm_fhtom(ndp->ni_dvp);
-       nfsm_strtom(ndp->ni_dent.d_name, ndp->ni_dent.d_namlen, NFS_MAXNAMLEN);
-       nfsm_request(vp);
+       nfsm_strtom(cnp->cn_nameptr, cnp->cn_namelen, NFS_MAXNAMLEN);
+       nfsm_request(tdvp, NFSPROC_LINK, cnp->cn_proc, cnp->cn_cred);
        nfsm_reqdone;
        nfsm_reqdone;
-       if (ndp->ni_dvp != vp)
-               nfs_unlock(vp);
-       nfs_nput(ndp->ni_dvp);
+       FREE(cnp->cn_pnbuf, M_NAMEI);
+       VTONFS(tdvp)->n_attrstamp = 0;
+       VTONFS(vp)->n_flag |= NMODIFIED;
+       vrele(vp);
+       /*
+        * Kludge: Map EEXIST => 0 assuming that it is a reply to a retry.
+        */
+       if (error == EEXIST)
+               error = 0;
        return (error);
 }
 
 /*
  * nfs symbolic link create call
  */
        return (error);
 }
 
 /*
  * nfs symbolic link create call
  */
-nfs_symlink(ndp, vap, nm)
-       struct nameidata *ndp;
-       struct vattr *vap;
-       char *nm;               /* is this the path ?? */
+/* start here */
+int
+nfs_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;
 {
 {
+       register struct vnode *dvp = ap->a_dvp;
+       register struct vattr *vap = ap->a_vap;
+       register struct componentname *cnp = ap->a_cnp;
        register struct nfsv2_sattr *sp;
        register struct nfsv2_sattr *sp;
-       register u_long *p;
+       register u_long *tl;
        register caddr_t cp;
        register caddr_t cp;
-       register long t1, t2;
+       register long t2;
        caddr_t bpos, dpos;
        caddr_t bpos, dpos;
-       u_long xid;
-       int error = 0;
+       int slen, error = 0, isnq;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
        nfsstats.rpccnt[NFSPROC_SYMLINK]++;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
        nfsstats.rpccnt[NFSPROC_SYMLINK]++;
-       nfsm_reqhead(nfs_procids[NFSPROC_SYMLINK], ndp->ni_cred,
-       NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(ndp->ni_dent.d_namlen)+NFSX_UNSIGNED);
-       nfsm_fhtom(ndp->ni_dvp);
-       nfsm_strtom(ndp->ni_dent.d_name, ndp->ni_dent.d_namlen, NFS_MAXNAMLEN);
-       nfsm_strtom(nm, strlen(nm), NFS_MAXPATHLEN);
-       nfsm_build(sp, struct nfsv2_sattr *, NFSX_SATTR);
+       slen = strlen(ap->a_target);
+       isnq = (VFSTONFS(dvp->v_mount)->nm_flag & NFSMNT_NQNFS);
+       nfsm_reqhead(dvp, NFSPROC_SYMLINK, NFSX_FH+2*NFSX_UNSIGNED+
+           nfsm_rndup(cnp->cn_namelen)+nfsm_rndup(slen)+NFSX_SATTR(isnq));
+       nfsm_fhtom(dvp);
+       nfsm_strtom(cnp->cn_nameptr, cnp->cn_namelen, NFS_MAXNAMLEN);
+       nfsm_strtom(ap->a_target, slen, NFS_MAXPATHLEN);
+       nfsm_build(sp, struct nfsv2_sattr *, NFSX_SATTR(isnq));
        sp->sa_mode = vtonfs_mode(VLNK, vap->va_mode);
        sp->sa_mode = vtonfs_mode(VLNK, vap->va_mode);
-       sp->sa_uid = txdr_unsigned(ndp->ni_cred->cr_uid);
-       sp->sa_gid = txdr_unsigned(ndp->ni_cred->cr_gid);
-       sp->sa_size = txdr_unsigned(VNOVAL);
-       txdr_time(&vap->va_atime, &sp->sa_atime);               /* or VNOVAL ?? */
-       txdr_time(&vap->va_mtime, &sp->sa_mtime);       /* or VNOVAL ?? */
-       nfsm_request(ndp->ni_dvp);
+       sp->sa_uid = txdr_unsigned(cnp->cn_cred->cr_uid);
+       sp->sa_gid = txdr_unsigned(cnp->cn_cred->cr_gid);
+       if (isnq) {
+               quad_t qval = -1;
+
+               txdr_hyper(&qval, &sp->sa_nqsize);
+               sp->sa_nqflags = 0;
+               txdr_nqtime(&vap->va_atime, &sp->sa_nqatime);
+               txdr_nqtime(&vap->va_mtime, &sp->sa_nqmtime);
+       } else {
+               sp->sa_nfssize = -1;
+               txdr_nfstime(&vap->va_atime, &sp->sa_nfsatime);
+               txdr_nfstime(&vap->va_mtime, &sp->sa_nfsmtime);
+       }
+       nfsm_request(dvp, NFSPROC_SYMLINK, cnp->cn_proc, cnp->cn_cred);
        nfsm_reqdone;
        nfsm_reqdone;
-       nfs_nput(ndp->ni_dvp);
+       FREE(cnp->cn_pnbuf, M_NAMEI);
+       VTONFS(dvp)->n_flag |= NMODIFIED;
+       vrele(dvp);
+       /*
+        * Kludge: Map EEXIST => 0 assuming that it is a reply to a retry.
+        */
+       if (error == EEXIST)
+               error = 0;
        return (error);
 }
 
 /*
  * nfs make dir call
  */
        return (error);
 }
 
 /*
  * nfs make dir call
  */
-nfs_mkdir(ndp, vap)
-       register struct nameidata *ndp;
-       struct vattr *vap;
+int
+nfs_mkdir(ap)
+       struct vop_mkdir_args /* {
+               struct vnode *a_dvp;
+               struct vnode **a_vpp;
+               struct componentname *a_cnp;
+               struct vattr *a_vap;
+       } */ *ap;
 {
 {
+       register struct vnode *dvp = ap->a_dvp;
+       register struct vattr *vap = ap->a_vap;
+       register struct componentname *cnp = ap->a_cnp;
+       register struct vnode **vpp = ap->a_vpp;
        register struct nfsv2_sattr *sp;
        register struct nfsv2_sattr *sp;
-       register u_long *p;
+       register u_long *tl;
        register caddr_t cp;
        register long t1, t2;
        register caddr_t cp;
        register long t1, t2;
+       register int len;
        caddr_t bpos, dpos, cp2;
        caddr_t bpos, dpos, cp2;
-       u_long xid;
-       int error = 0;
+       int error = 0, firsttry = 1, isnq;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
+       struct vattr vattr;
 
 
+       if (error = VOP_GETATTR(dvp, &vattr, cnp->cn_cred, cnp->cn_proc)) {
+               VOP_ABORTOP(dvp, cnp);
+               vput(dvp);
+               return (error);
+       }
+       len = cnp->cn_namelen;
+       isnq = (VFSTONFS(dvp->v_mount)->nm_flag & NFSMNT_NQNFS);
        nfsstats.rpccnt[NFSPROC_MKDIR]++;
        nfsstats.rpccnt[NFSPROC_MKDIR]++;
-       nfsm_reqhead(nfs_procids[NFSPROC_MKDIR], ndp->ni_cred,
-         NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(ndp->ni_dent.d_namlen)+NFSX_SATTR);
-       nfsm_fhtom(ndp->ni_dvp);
-       nfsm_strtom(ndp->ni_dent.d_name, ndp->ni_dent.d_namlen, NFS_MAXNAMLEN);
-       nfsm_build(sp, struct nfsv2_sattr *, NFSX_SATTR);
+       nfsm_reqhead(dvp, NFSPROC_MKDIR,
+         NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(len)+NFSX_SATTR(isnq));
+       nfsm_fhtom(dvp);
+       nfsm_strtom(cnp->cn_nameptr, len, NFS_MAXNAMLEN);
+       nfsm_build(sp, struct nfsv2_sattr *, NFSX_SATTR(isnq));
        sp->sa_mode = vtonfs_mode(VDIR, vap->va_mode);
        sp->sa_mode = vtonfs_mode(VDIR, vap->va_mode);
-       sp->sa_uid = txdr_unsigned(ndp->ni_cred->cr_uid);
-       sp->sa_gid = txdr_unsigned(ndp->ni_cred->cr_gid);
-       sp->sa_size = txdr_unsigned(VNOVAL);
-       txdr_time(&vap->va_atime, &sp->sa_atime);               /* or VNOVAL ?? */
-       txdr_time(&vap->va_mtime, &sp->sa_mtime);       /* or VNOVAL ?? */
-       nfsm_request(ndp->ni_dvp);
-       nfsm_mtofh(ndp->ni_dvp, ndp->ni_vp);
+       sp->sa_uid = txdr_unsigned(cnp->cn_cred->cr_uid);
+       sp->sa_gid = txdr_unsigned(vattr.va_gid);
+       if (isnq) {
+               quad_t qval = -1;
+
+               txdr_hyper(&qval, &sp->sa_nqsize);
+               sp->sa_nqflags = 0;
+               txdr_nqtime(&vap->va_atime, &sp->sa_nqatime);
+               txdr_nqtime(&vap->va_mtime, &sp->sa_nqmtime);
+       } else {
+               sp->sa_nfssize = -1;
+               txdr_nfstime(&vap->va_atime, &sp->sa_nfsatime);
+               txdr_nfstime(&vap->va_mtime, &sp->sa_nfsmtime);
+       }
+       nfsm_request(dvp, NFSPROC_MKDIR, cnp->cn_proc, cnp->cn_cred);
+       nfsm_mtofh(dvp, *vpp);
        nfsm_reqdone;
        nfsm_reqdone;
-       nfs_nput(ndp->ni_dvp);
+       VTONFS(dvp)->n_flag |= NMODIFIED;
+       /*
+        * Kludge: Map EEXIST => 0 assuming that you have a reply to a retry
+        * if we can succeed in looking up the directory.
+        * "firsttry" is necessary since the macros may "goto nfsmout" which
+        * is above the if on errors. (Ugh)
+        */
+       if (error == EEXIST && firsttry) {
+               firsttry = 0;
+               error = 0;
+               nfsstats.rpccnt[NFSPROC_LOOKUP]++;
+               *vpp = NULL;
+               nfsm_reqhead(dvp, NFSPROC_LOOKUP,
+                   NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(len));
+               nfsm_fhtom(dvp);
+               nfsm_strtom(cnp->cn_nameptr, len, NFS_MAXNAMLEN);
+               nfsm_request(dvp, NFSPROC_LOOKUP, cnp->cn_proc, cnp->cn_cred);
+               nfsm_mtofh(dvp, *vpp);
+               if ((*vpp)->v_type != VDIR) {
+                       vput(*vpp);
+                       error = EEXIST;
+               }
+               m_freem(mrep);
+       }
+       FREE(cnp->cn_pnbuf, M_NAMEI);
+       vrele(dvp);
        return (error);
 }
 
 /*
  * nfs remove directory call
  */
        return (error);
 }
 
 /*
  * nfs remove directory call
  */
-nfs_rmdir(ndp)
-       register struct nameidata *ndp;
+int
+nfs_rmdir(ap)
+       struct vop_rmdir_args /* {
+               struct vnode *a_dvp;
+               struct vnode *a_vp;
+               struct componentname *a_cnp;
+       } */ *ap;
 {
 {
-       register u_long *p;
+       register struct vnode *vp = ap->a_vp;
+       register struct vnode *dvp = ap->a_dvp;
+       register struct componentname *cnp = ap->a_cnp;
+       register u_long *tl;
        register caddr_t cp;
        register caddr_t cp;
-       register long t1, t2;
+       register long t2;
        caddr_t bpos, dpos;
        caddr_t bpos, dpos;
-       u_long xid;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
-       if (ndp->ni_dvp == ndp->ni_vp) {
-               vrele(ndp->ni_dvp);
-               nfs_nput(ndp->ni_dvp);
+       if (dvp == vp) {
+               vrele(dvp);
+               vrele(dvp);
+               FREE(cnp->cn_pnbuf, M_NAMEI);
                return (EINVAL);
        }
        nfsstats.rpccnt[NFSPROC_RMDIR]++;
                return (EINVAL);
        }
        nfsstats.rpccnt[NFSPROC_RMDIR]++;
-       nfsm_reqhead(nfs_procids[NFSPROC_RMDIR], ndp->ni_cred,
-               NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(ndp->ni_dent.d_namlen));
-       nfsm_fhtom(ndp->ni_dvp);
-       nfsm_strtom(ndp->ni_dent.d_name, ndp->ni_dent.d_namlen, NFS_MAXNAMLEN);
-       nfsm_request(ndp->ni_dvp);
+       nfsm_reqhead(dvp, NFSPROC_RMDIR,
+               NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(cnp->cn_namelen));
+       nfsm_fhtom(dvp);
+       nfsm_strtom(cnp->cn_nameptr, cnp->cn_namelen, NFS_MAXNAMLEN);
+       nfsm_request(dvp, NFSPROC_RMDIR, cnp->cn_proc, cnp->cn_cred);
        nfsm_reqdone;
        nfsm_reqdone;
-       cache_purge(ndp->ni_dvp);
-       cache_purge(ndp->ni_vp);
-       nfs_nput(ndp->ni_vp);
-       nfs_nput(ndp->ni_dvp);
+       FREE(cnp->cn_pnbuf, M_NAMEI);
+       VTONFS(dvp)->n_flag |= NMODIFIED;
+       cache_purge(dvp);
+       cache_purge(vp);
+       vrele(vp);
+       vrele(dvp);
+       /*
+        * Kludge: Map ENOENT => 0 assuming that you have a reply to a retry.
+        */
+       if (error == ENOENT)
+               error = 0;
        return (error);
 }
 
        return (error);
 }
 
@@ -983,139 +1497,367 @@ nfs_rmdir(ndp)
  * order so that it looks more sensible. This appears consistent with the
  * Ultrix implementation of NFS.
  */
  * order so that it looks more sensible. This appears consistent with the
  * Ultrix implementation of NFS.
  */
-nfs_readdir(vp, uiop, cred)
-       register struct vnode *vp;
-       struct uio *uiop;
-       struct ucred *cred;
+int
+nfs_readdir(ap)
+       struct vop_readdir_args /* {
+               struct vnode *a_vp;
+               struct uio *a_uio;
+               struct ucred *a_cred;
+       } */ *ap;
 {
 {
-       register long len;
-       register struct direct *dp;
-       register u_long *p;
-       register caddr_t cp;
-       register long t1;
-       caddr_t bpos, dpos, cp2;
-       u_long xid;
+       register struct vnode *vp = ap->a_vp;
+       register struct nfsnode *np = VTONFS(vp);
+       register struct uio *uio = ap->a_uio;
+       int tresid, error;
+       struct vattr vattr;
+
+       if (vp->v_type != VDIR)
+               return (EPERM);
+       /*
+        * First, check for hit on the EOF offset cache
+        */
+       if (uio->uio_offset != 0 && uio->uio_offset == np->n_direofoffset &&
+           (np->n_flag & NMODIFIED) == 0) {
+               if (VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NQNFS) {
+                       if (NQNFS_CKCACHABLE(vp, NQL_READ)) {
+                               nfsstats.direofcache_hits++;
+                               return (0);
+                       }
+               } else if (VOP_GETATTR(vp, &vattr, ap->a_cred, uio->uio_procp) == 0 &&
+                       np->n_mtime == vattr.va_mtime.ts_sec) {
+                       nfsstats.direofcache_hits++;
+                       return (0);
+               }
+       }
+
+       /*
+        * Call nfs_bioread() to do the real work.
+        */
+       tresid = uio->uio_resid;
+       error = nfs_bioread(vp, uio, 0, ap->a_cred);
+
+       if (!error && uio->uio_resid == tresid)
+               nfsstats.direofcache_misses++;
+       return (error);
+}
+
+/*
+ * Readdir rpc call.
+ * Called from below the buffer cache by nfs_doio().
+ */
+int
+nfs_readdirrpc(vp, uiop, cred)
+       register struct vnode *vp;
+       struct uio *uiop;
+       struct ucred *cred;
+{
+       register long len;
+       register struct dirent *dp;
+       register u_long *tl;
+       register caddr_t cp;
+       register long t1;
+       long tlen, lastlen;
+       caddr_t bpos, dpos, cp2;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        struct mbuf *md2;
        caddr_t dpos2;
        int siz;
        int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        struct mbuf *md2;
        caddr_t dpos2;
        int siz;
-       int more_dirs;
-       off_t off, savoff;
-       struct direct *savdp;
+       int more_dirs = 1;
+       u_long off, savoff;
+       struct dirent *savdp;
+       struct nfsmount *nmp;
+       struct nfsnode *np = VTONFS(vp);
+       long tresid;
 
 
-       nfsstats.rpccnt[NFSPROC_READDIR]++;
-       nfsm_reqhead(nfs_procids[NFSPROC_READDIR], cred, xid);
-       nfsm_fhtom(vp);
-       nfsm_build(p, u_long *, 2*NFSX_UNSIGNED);
-       *p++ = txdr_unsigned(uiop->uio_offset);
-       *p = txdr_unsigned(uiop->uio_resid);
-       nfsm_request(vp);
-       siz = 0;
-       nfsm_disect(p, u_long *, NFSX_UNSIGNED);
-       more_dirs = fxdr_unsigned(int, *p);
-
-       /* Save the position so that we can do nfsm_mtouio() later */
-       dpos2 = dpos;
-       md2 = md;
-
-       /* loop thru the dir entries, doctoring them to 4bsd form */
-       savoff = off = 0;
-       savdp = dp = NULL;
-       while (more_dirs && siz < uiop->uio_resid) {
-               savoff = off;           /* Hold onto offset and dp */
-               savdp = dp;
-               nfsm_disecton(p, u_long *, 2*NFSX_UNSIGNED);
-               dp = (struct direct *)p;
-               dp->d_ino = fxdr_unsigned(u_long, *p++);
-               len = fxdr_unsigned(int, *p);
-               if (len <= 0 || len > NFS_MAXNAMLEN) {
-                       error = EBADRPC;
-                       m_freem(mrep);
-                       goto nfsmout;
-               }
-               dp->d_namlen = (u_short)len;
-               len = nfsm_rndup(len);
-               nfsm_adv(len);
-               nfsm_disecton(p, u_long *, 2*NFSX_UNSIGNED);
-               off = fxdr_unsigned(off_t, *p);
-               *p++ = 0;               /* Ensures null termination of name */
-               more_dirs = fxdr_unsigned(int, *p);
-               dp->d_reclen = len+4*NFSX_UNSIGNED;
-               siz += dp->d_reclen;
-       }
+       nmp = VFSTONFS(vp->v_mount);
+       tresid = uiop->uio_resid;
        /*
        /*
-        * If at end of rpc data, get the eof boolean
+        * Loop around doing readdir rpc's of size uio_resid or nm_rsize,
+        * whichever is smaller, truncated to a multiple of NFS_DIRBLKSIZ.
+        * The stopping criteria is EOF or buffer full.
         */
         */
-       if (!more_dirs)
-               nfsm_disecton(p, u_long *, NFSX_UNSIGNED);
+       while (more_dirs && uiop->uio_resid >= NFS_DIRBLKSIZ) {
+               nfsstats.rpccnt[NFSPROC_READDIR]++;
+               nfsm_reqhead(vp, NFSPROC_READDIR,
+                       NFSX_FH + 2 * NFSX_UNSIGNED);
+               nfsm_fhtom(vp);
+               nfsm_build(tl, u_long *, 2 * NFSX_UNSIGNED);
+               off = (u_long)uiop->uio_offset;
+               *tl++ = txdr_unsigned(off);
+               *tl = txdr_unsigned(((uiop->uio_resid > nmp->nm_rsize) ?
+                       nmp->nm_rsize : uiop->uio_resid) & ~(NFS_DIRBLKSIZ-1));
+               nfsm_request(vp, NFSPROC_READDIR, uiop->uio_procp, cred);
+               siz = 0;
+               nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+               more_dirs = fxdr_unsigned(int, *tl);
+       
+               /* Save the position so that we can do nfsm_mtouio() later */
+               dpos2 = dpos;
+               md2 = md;
+       
+               /* loop thru the dir entries, doctoring them to 4bsd form */
+#ifdef lint
+               dp = (struct dirent *)0;
+#endif /* lint */
+               while (more_dirs && siz < uiop->uio_resid) {
+                       savoff = off;           /* Hold onto offset and dp */
+                       savdp = dp;
+                       nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED);
+                       dp = (struct dirent *)tl;
+                       dp->d_fileno = fxdr_unsigned(u_long, *tl++);
+                       len = fxdr_unsigned(int, *tl);
+                       if (len <= 0 || len > NFS_MAXNAMLEN) {
+                               error = EBADRPC;
+                               m_freem(mrep);
+                               goto nfsmout;
+                       }
+                       dp->d_namlen = (u_char)len;
+                       dp->d_type = DT_UNKNOWN;
+                       nfsm_adv(len);          /* Point past name */
+                       tlen = nfsm_rndup(len);
+                       /*
+                        * This should not be necessary, but some servers have
+                        * broken XDR such that these bytes are not null filled.
+                        */
+                       if (tlen != len) {
+                               *dpos = '\0';   /* Null-terminate */
+                               nfsm_adv(tlen - len);
+                               len = tlen;
+                       }
+                       nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED);
+                       off = fxdr_unsigned(u_long, *tl);
+                       *tl++ = 0;      /* Ensures null termination of name */
+                       more_dirs = fxdr_unsigned(int, *tl);
+                       dp->d_reclen = len + 4 * NFSX_UNSIGNED;
+                       siz += dp->d_reclen;
+               }
+               /*
+                * If at end of rpc data, get the eof boolean
+                */
+               if (!more_dirs) {
+                       nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+                       more_dirs = (fxdr_unsigned(int, *tl) == 0);
+
+                       /*
+                        * If at EOF, cache directory offset
+                        */
+                       if (!more_dirs)
+                               np->n_direofoffset = off;
+               }
+               /*
+                * If there is too much to fit in the data buffer, use savoff and
+                * savdp to trim off the last record.
+                * --> we are not at eof
+                */
+               if (siz > uiop->uio_resid) {
+                       off = savoff;
+                       siz -= dp->d_reclen;
+                       dp = savdp;
+                       more_dirs = 0;  /* Paranoia */
+               }
+               if (siz > 0) {
+                       lastlen = dp->d_reclen;
+                       md = md2;
+                       dpos = dpos2;
+                       nfsm_mtouio(uiop, siz);
+                       uiop->uio_offset = (off_t)off;
+               } else
+                       more_dirs = 0;  /* Ugh, never happens, but in case.. */
+               m_freem(mrep);
+       }
        /*
        /*
-        * If there is too much to fit in the data buffer, use savoff and
-        * savdp to trim off the last record.
-        * --> we are not at eof
+        * Fill last record, iff any, out to a multiple of NFS_DIRBLKSIZ
+        * by increasing d_reclen for the last record.
         */
         */
-       if (siz > uiop->uio_resid) {
-               off = savoff;
-               siz -= dp->d_reclen;
-               dp = savdp;
-       }
-       if (siz > 0) {
-               md = md2;
-               dpos = dpos2;
-               nfsm_mtouio(uiop, siz);
-               uiop->uio_offset = off;
+       if (uiop->uio_resid < tresid) {
+               len = uiop->uio_resid & (NFS_DIRBLKSIZ - 1);
+               if (len > 0) {
+                       dp = (struct dirent *)
+                               (uiop->uio_iov->iov_base - lastlen);
+                       dp->d_reclen += len;
+                       uiop->uio_iov->iov_base += len;
+                       uiop->uio_iov->iov_len -= len;
+                       uiop->uio_resid -= len;
+               }
        }
        }
-       nfsm_reqdone;
+nfsmout:
        return (error);
 }
 
 /*
        return (error);
 }
 
 /*
- * nfs statfs call
- * (Actually a vfsop, not a vnode op)
+ * Nqnfs readdir_and_lookup RPC. Used in place of nfs_readdirrpc().
  */
  */
-nfs_statfs(mp, sbp)
-       struct mount *mp;
-       register struct statfs *sbp;
+int
+nfs_readdirlookrpc(vp, uiop, cred)
+       struct vnode *vp;
+       register struct uio *uiop;
+       struct ucred *cred;
 {
 {
-       register struct vnode *vp;
-       register struct nfsv2_statfs *sfp;
+       register int len;
+       register struct dirent *dp;
+       register u_long *tl;
        register caddr_t cp;
        register long t1;
        caddr_t bpos, dpos, cp2;
        register caddr_t cp;
        register long t1;
        caddr_t bpos, dpos, cp2;
-       u_long xid;
-       int error = 0;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
+       struct nameidata nami, *ndp = &nami;
+       struct componentname *cnp = &ndp->ni_cnd;
+       u_long off, endoff, fileno;
+       time_t reqtime, ltime;
        struct nfsmount *nmp;
        struct nfsmount *nmp;
-       struct ucred *cred;
-       struct nfsnode *np;
+       struct nfsnode *np, *tp;
+       struct vnode *newvp;
+       nfsv2fh_t *fhp;
+       u_quad_t frev;
+       int error = 0, tlen, more_dirs = 1, tresid, doit, bigenough, i;
+       int cachable;
+
+       if (uiop->uio_iovcnt != 1)
+               panic("nfs rdirlook");
+       nmp = VFSTONFS(vp->v_mount);
+       tresid = uiop->uio_resid;
+       ndp->ni_dvp = vp;
+       newvp = NULLVP;
+       /*
+        * Loop around doing readdir rpc's of size uio_resid or nm_rsize,
+        * whichever is smaller, truncated to a multiple of NFS_DIRBLKSIZ.
+        * The stopping criteria is EOF or buffer full.
+        */
+       while (more_dirs && uiop->uio_resid >= NFS_DIRBLKSIZ) {
+               nfsstats.rpccnt[NQNFSPROC_READDIRLOOK]++;
+               nfsm_reqhead(vp, NQNFSPROC_READDIRLOOK,
+                       NFSX_FH + 3 * NFSX_UNSIGNED);
+               nfsm_fhtom(vp);
+               nfsm_build(tl, u_long *, 3 * NFSX_UNSIGNED);
+               off = (u_long)uiop->uio_offset;
+               *tl++ = txdr_unsigned(off);
+               *tl++ = txdr_unsigned(((uiop->uio_resid > nmp->nm_rsize) ?
+                       nmp->nm_rsize : uiop->uio_resid) & ~(NFS_DIRBLKSIZ-1));
+               if (nmp->nm_flag & NFSMNT_NQLOOKLEASE)
+                       *tl = txdr_unsigned(nmp->nm_leaseterm);
+               else
+                       *tl = 0;
+               reqtime = time.tv_sec;
+               nfsm_request(vp, NQNFSPROC_READDIRLOOK, uiop->uio_procp, cred);
+               nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+               more_dirs = fxdr_unsigned(int, *tl);
+       
+               /* loop thru the dir entries, doctoring them to 4bsd form */
+               bigenough = 1;
+               while (more_dirs && bigenough) {
+                       doit = 1;
+                       nfsm_dissect(tl, u_long *, 4 * NFSX_UNSIGNED);
+                       if (nmp->nm_flag & NFSMNT_NQLOOKLEASE) {
+                               cachable = fxdr_unsigned(int, *tl++);
+                               ltime = reqtime + fxdr_unsigned(int, *tl++);
+                               fxdr_hyper(tl, &frev);
+                       }
+                       nfsm_dissect(fhp, nfsv2fh_t *, NFSX_FH);
+                       if (!bcmp(VTONFS(vp)->n_fh.fh_bytes, (caddr_t)fhp, NFSX_FH)) {
+                               VREF(vp);
+                               newvp = vp;
+                               np = VTONFS(vp);
+                       } else {
+                               if (error = nfs_nget(vp->v_mount, fhp, &np))
+                                       doit = 0;
+                               newvp = NFSTOV(np);
+                       }
+                       if (error = nfs_loadattrcache(&newvp, &md, &dpos,
+                               (struct vattr *)0))
+                               doit = 0;
+                       nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED);
+                       fileno = fxdr_unsigned(u_long, *tl++);
+                       len = fxdr_unsigned(int, *tl);
+                       if (len <= 0 || len > NFS_MAXNAMLEN) {
+                               error = EBADRPC;
+                               m_freem(mrep);
+                               goto nfsmout;
+                       }
+                       tlen = (len + 4) & ~0x3;
+                       if ((tlen + DIRHDSIZ) > uiop->uio_resid)
+                               bigenough = 0;
+                       if (bigenough && doit) {
+                               dp = (struct dirent *)uiop->uio_iov->iov_base;
+                               dp->d_fileno = fileno;
+                               dp->d_namlen = len;
+                               dp->d_reclen = tlen + DIRHDSIZ;
+                               dp->d_type =
+                                   IFTODT(VTTOIF(np->n_vattr.va_type));
+                               uiop->uio_resid -= DIRHDSIZ;
+                               uiop->uio_iov->iov_base += DIRHDSIZ;
+                               uiop->uio_iov->iov_len -= DIRHDSIZ;
+                               cnp->cn_nameptr = uiop->uio_iov->iov_base;
+                               cnp->cn_namelen = len;
+                               ndp->ni_vp = newvp;
+                               nfsm_mtouio(uiop, len);
+                               cp = uiop->uio_iov->iov_base;
+                               tlen -= len;
+                               for (i = 0; i < tlen; i++)
+                                       *cp++ = '\0';
+                               uiop->uio_iov->iov_base += tlen;
+                               uiop->uio_iov->iov_len -= tlen;
+                               uiop->uio_resid -= tlen;
+                               cnp->cn_hash = 0;
+                               for (cp = cnp->cn_nameptr, i = 1; i <= len; i++, cp++)
+                                       cnp->cn_hash += (unsigned char)*cp * i;
+                               if ((nmp->nm_flag & NFSMNT_NQLOOKLEASE) &&
+                                       ltime > time.tv_sec)
+                                       nqnfs_clientlease(nmp, np, NQL_READ,
+                                               cachable, ltime, frev);
+                               if (cnp->cn_namelen <= NCHNAMLEN)
+                                   cache_enter(ndp->ni_dvp, ndp->ni_vp, cnp);
+                       } else {
+                               nfsm_adv(nfsm_rndup(len));
+                       }
+                       if (newvp != NULLVP) {
+                               vrele(newvp);
+                               newvp = NULLVP;
+                       }
+                       nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED);
+                       if (bigenough)
+                               endoff = off = fxdr_unsigned(u_long, *tl++);
+                       else
+                               endoff = fxdr_unsigned(u_long, *tl++);
+                       more_dirs = fxdr_unsigned(int, *tl);
+               }
+               /*
+                * If at end of rpc data, get the eof boolean
+                */
+               if (!more_dirs) {
+                       nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+                       more_dirs = (fxdr_unsigned(int, *tl) == 0);
 
 
-       nmp = vfs_to_nfs(mp);
-       if (error = nfs_nget(mp, &nmp->nm_fh, &np))
-               return (error);
-       vp = NFSTOV(np);
-       nfsstats.rpccnt[NFSPROC_STATFS]++;
-       cred = crget();
-       cred->cr_ngroups = 1;
-       nfsm_reqhead(nfs_procids[NFSPROC_STATFS], cred, NFSX_FH);
-       nfsm_fhtom(vp);
-       nfsm_request(vp);
-       nfsm_disect(sfp, struct nfsv2_statfs *, NFSX_STATFS);
-       sbp->f_type = MOUNT_NFS;
-       sbp->f_bsize = fxdr_unsigned(long, sfp->sf_tsize);
-       sbp->f_fsize = fxdr_unsigned(long, sfp->sf_bsize);
-       sbp->f_blocks = fxdr_unsigned(long, sfp->sf_blocks);
-       sbp->f_bfree = fxdr_unsigned(long, sfp->sf_bfree);
-       sbp->f_bavail = fxdr_unsigned(long, sfp->sf_bavail);
-       sbp->f_files = 0;
-       sbp->f_ffree = 0;
-       bcopy(nmp->nm_path, sbp->f_mntonname, MNAMELEN);
-       bcopy(nmp->nm_host, sbp->f_mntfromname, MNAMELEN);
-       nfsm_reqdone;
-       nfs_nput(vp);
-       crfree(cred);
+                       /*
+                        * If at EOF, cache directory offset
+                        */
+                       if (!more_dirs)
+                               VTONFS(vp)->n_direofoffset = endoff;
+               }
+               if (uiop->uio_resid < tresid)
+                       uiop->uio_offset = (off_t)off;
+               else
+                       more_dirs = 0;
+               m_freem(mrep);
+       }
+       /*
+        * Fill last record, iff any, out to a multiple of NFS_DIRBLKSIZ
+        * by increasing d_reclen for the last record.
+        */
+       if (uiop->uio_resid < tresid) {
+               len = uiop->uio_resid & (NFS_DIRBLKSIZ - 1);
+               if (len > 0) {
+                       dp->d_reclen += len;
+                       uiop->uio_iov->iov_base += len;
+                       uiop->uio_iov->iov_len -= len;
+                       uiop->uio_resid -= len;
+               }
+       }
+nfsmout:
+       if (newvp != NULLVP)
+               vrele(newvp);
        return (error);
 }
        return (error);
 }
-
 static char hextoasc[] = "0123456789abcdef";
 
 /*
 static char hextoasc[] = "0123456789abcdef";
 
 /*
@@ -1126,51 +1868,56 @@ static char hextoasc[] = "0123456789abcdef";
  * to create the same funny name between the nfs_lookitup() fails and the
  * nfs_rename() completes, but...
  */
  * to create the same funny name between the nfs_lookitup() fails and the
  * nfs_rename() completes, but...
  */
-nfs_sillyrename(ndp, flag)
-       register struct nameidata *ndp;
-       int flag;
+int
+nfs_sillyrename(dvp, vp, cnp)
+       struct vnode *dvp, *vp;
+       struct componentname *cnp;
 {
        register struct nfsnode *np;
        register struct sillyrename *sp;
 {
        register struct nfsnode *np;
        register struct sillyrename *sp;
-       register struct nameidata *tndp;
        int error;
        short pid;
 
        int error;
        short pid;
 
-       np = VTONFS(ndp->ni_dvp);
-       cache_purge(ndp->ni_dvp);
+       cache_purge(dvp);
+       np = VTONFS(vp);
+#ifdef SILLYSEPARATE
        MALLOC(sp, struct sillyrename *, sizeof (struct sillyrename),
        MALLOC(sp, struct sillyrename *, sizeof (struct sillyrename),
-               M_TEMP, M_WAITOK);
-       sp->s_flag = flag;
-       bcopy((caddr_t)&np->n_fh, (caddr_t)&sp->s_fh, NFSX_FH);
-       np = VTONFS(ndp->ni_vp);
-       tndp = &sp->s_namei;
-       tndp->ni_cred = crdup(ndp->ni_cred);
+               M_NFSREQ, M_WAITOK);
+#else
+       sp = &np->n_silly;
+#endif
+       sp->s_cred = crdup(cnp->cn_cred);
+       sp->s_dvp = dvp;
+       VREF(dvp);
 
        /* Fudge together a funny name */
 
        /* Fudge together a funny name */
-       pid = u.u_procp->p_pid;
-       bcopy(".nfsAxxxx4.4", tndp->ni_dent.d_name, 13);
-       tndp->ni_dent.d_namlen = 12;
-       tndp->ni_dent.d_name[8] = hextoasc[pid & 0xf];
-       tndp->ni_dent.d_name[7] = hextoasc[(pid >> 4) & 0xf];
-       tndp->ni_dent.d_name[6] = hextoasc[(pid >> 8) & 0xf];
-       tndp->ni_dent.d_name[5] = hextoasc[(pid >> 12) & 0xf];
+       pid = cnp->cn_proc->p_pid;
+       bcopy(".nfsAxxxx4.4", sp->s_name, 13);
+       sp->s_namlen = 12;
+       sp->s_name[8] = hextoasc[pid & 0xf];
+       sp->s_name[7] = hextoasc[(pid >> 4) & 0xf];
+       sp->s_name[6] = hextoasc[(pid >> 8) & 0xf];
+       sp->s_name[5] = hextoasc[(pid >> 12) & 0xf];
 
        /* Try lookitups until we get one that isn't there */
 
        /* Try lookitups until we get one that isn't there */
-       while (nfs_lookitup(ndp->ni_dvp, tndp, (nfsv2fh_t *)0) == 0) {
-               tndp->ni_dent.d_name[4]++;
-               if (tndp->ni_dent.d_name[4] > 'z') {
+       while (nfs_lookitup(sp, (nfsv2fh_t *)0, cnp->cn_proc) == 0) {
+               sp->s_name[4]++;
+               if (sp->s_name[4] > 'z') {
                        error = EINVAL;
                        goto bad;
                }
        }
                        error = EINVAL;
                        goto bad;
                }
        }
-       if (error = nfs_renameit(ndp, tndp))
+       if (error = nfs_renameit(dvp, cnp, sp))
                goto bad;
                goto bad;
-       nfs_lookitup(ndp->ni_dvp, tndp, &np->n_fh);
+       nfs_lookitup(sp, &np->n_fh, cnp->cn_proc);
        np->n_sillyrename = sp;
        return (0);
 bad:
        np->n_sillyrename = sp;
        return (0);
 bad:
-       crfree(tndp->ni_cred);
-       free((caddr_t)sp, M_TEMP);
+       vrele(sp->s_dvp);
+       crfree(sp->s_cred);
+#ifdef SILLYSEPARATE
+       free((caddr_t)sp, M_NFSREQ);
+#endif
        return (error);
 }
 
        return (error);
 }
 
@@ -1180,30 +1927,37 @@ bad:
  * into the nfsnode table.
  * If fhp != NULL it copies the returned file handle out
  */
  * into the nfsnode table.
  * If fhp != NULL it copies the returned file handle out
  */
-nfs_lookitup(vp, ndp, fhp)
-       register struct vnode *vp;
-       register struct nameidata *ndp;
+int
+nfs_lookitup(sp, fhp, procp)
+       register struct sillyrename *sp;
        nfsv2fh_t *fhp;
        nfsv2fh_t *fhp;
+       struct proc *procp;
 {
 {
-       register u_long *p;
+       register struct vnode *vp = sp->s_dvp;
+       register u_long *tl;
        register caddr_t cp;
        register long t1, t2;
        caddr_t bpos, dpos, cp2;
        u_long xid;
        register caddr_t cp;
        register long t1, t2;
        caddr_t bpos, dpos, cp2;
        u_long xid;
-       int error = 0;
+       int error = 0, isnq;
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        long len;
 
        struct mbuf *mreq, *mrep, *md, *mb, *mb2;
        long len;
 
+       isnq = (VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NQNFS);
        nfsstats.rpccnt[NFSPROC_LOOKUP]++;
        nfsstats.rpccnt[NFSPROC_LOOKUP]++;
-       ndp->ni_dvp = vp;
-       ndp->ni_vp = NULL;
-       len = ndp->ni_dent.d_namlen;
-       nfsm_reqhead(nfs_procids[NFSPROC_LOOKUP], ndp->ni_cred, NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(len));
+       len = sp->s_namlen;
+       nfsm_reqhead(vp, NFSPROC_LOOKUP, NFSX_FH+NFSX_UNSIGNED+nfsm_rndup(len));
+       if (isnq) {
+               nfsm_build(tl, u_long *, NFSX_UNSIGNED);
+               *tl = 0;
+       }
        nfsm_fhtom(vp);
        nfsm_fhtom(vp);
-       nfsm_strtom(ndp->ni_dent.d_name, len, NFS_MAXNAMLEN);
-       nfsm_request(vp);
+       nfsm_strtom(sp->s_name, len, NFS_MAXNAMLEN);
+       nfsm_request(vp, NFSPROC_LOOKUP, procp, sp->s_cred);
        if (fhp != NULL) {
        if (fhp != NULL) {
-               nfsm_disect(cp, caddr_t, NFSX_FH);
+               if (isnq)
+                       nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+               nfsm_dissect(cp, caddr_t, NFSX_FH);
                bcopy(cp, (caddr_t)fhp, NFSX_FH);
        }
        nfsm_reqdone;
                bcopy(cp, (caddr_t)fhp, NFSX_FH);
        }
        nfsm_reqdone;
@@ -1213,7 +1967,7 @@ nfs_lookitup(vp, ndp, fhp)
 /*
  * Kludge City..
  * - make nfs_bmap() essentially a no-op that does no translation
 /*
  * Kludge City..
  * - make nfs_bmap() essentially a no-op that does no translation
- * - do nfs_strategy() by faking physical I/O with nfs_readit/nfs_writeit
+ * - do nfs_strategy() by faking physical I/O with nfs_readrpc/nfs_writerpc
  *   after mapping the physical addresses into Kernel Virtual space in the
  *   nfsiobuf area.
  *   (Maybe I could use the process's page mapping, but I was concerned that
  *   after mapping the physical addresses into Kernel Virtual space in the
  *   nfsiobuf area.
  *   (Maybe I could use the process's page mapping, but I was concerned that
@@ -1221,230 +1975,529 @@ nfs_lookitup(vp, ndp, fhp)
  *    a lot more work than bcopy() and also it currently happens in the
  *    context of the swapper process (2).
  */
  *    a lot more work than bcopy() and also it currently happens in the
  *    context of the swapper process (2).
  */
-nfs_bmap(vp, bn, vpp, bnp)
-       struct vnode *vp;
-       daddr_t bn;
-       struct vnode **vpp;
-       daddr_t *bnp;
+int
+nfs_bmap(ap)
+       struct vop_bmap_args /* {
+               struct vnode *a_vp;
+               daddr_t  a_bn;
+               struct vnode **a_vpp;
+               daddr_t *a_bnp;
+               int *a_runp;
+       } */ *ap;
 {
 {
-       if (vpp != NULL)
-               *vpp = vp;
-       if (bnp != NULL)
-               *bnp = bn * btodb(vp->v_mount->m_bsize);
+       register struct vnode *vp = ap->a_vp;
+
+       if (ap->a_vpp != NULL)
+               *ap->a_vpp = vp;
+       if (ap->a_bnp != NULL)
+               *ap->a_bnp = ap->a_bn * btodb(vp->v_mount->mnt_stat.f_iosize);
        return (0);
 }
 
 /*
        return (0);
 }
 
 /*
- * Strategy routine for phys. i/o
- * If the biod's are running, queue a request
- * otherwise just call nfs_doio() to get it done
+ * Strategy routine.
+ * For async requests when nfsiod(s) are running, queue the request by
+ * calling nfs_asyncio(), otherwise just all nfs_doio() to do the
+ * request.
  */
  */
-nfs_strategy(bp)
-       register struct buf *bp;
+int
+nfs_strategy(ap)
+       struct vop_strategy_args *ap;
 {
 {
-       register struct buf *dp;
-       register int i;
-       struct proc *rp;
+       register struct buf *bp = ap->a_bp;
+       struct ucred *cr;
+       struct proc *p;
        int error = 0;
        int error = 0;
-       int fnd = 0;
 
 
+       if (bp->b_flags & B_PHYS)
+               panic("nfs physio");
+       if (bp->b_flags & B_ASYNC)
+               p = (struct proc *)0;
+       else
+               p = curproc;    /* XXX */
+       if (bp->b_flags & B_READ)
+               cr = bp->b_rcred;
+       else
+               cr = bp->b_wcred;
        /*
        /*
-        * If an i/o daemon is waiting
+        * If the op is asynchronous and an i/o daemon is waiting
         * queue the request, wake it up and wait for completion
         * queue the request, wake it up and wait for completion
-        * otherwise just do it ourselves
+        * otherwise just do it ourselves.
         */
         */
-       for (i = 0; i < nfs_asyncdaemons; i++) {
-               if (rp = nfs_iodwant[i]) {
-                       /*
-                        * Ensure that the async_daemon is still waiting here
-                        */
-                       if (rp->p_stat != SSLEEP ||
-                           rp->p_wchan != ((caddr_t)&nfs_iodwant[i])) {
-                               nfs_iodwant[i] = (struct proc *)0;
-                               continue;
-                       }
-                       dp = &nfs_bqueue;
-                       if (dp->b_actf == NULL) {
-                               dp->b_actl = bp;
-                               bp->b_actf = dp;
-                       } else {
-                               dp->b_actf->b_actl = bp;
-                               bp->b_actf = dp->b_actf;
-                       }
-                       dp->b_actf = bp;
-                       bp->b_actl = dp;
-                       fnd++;
-                       nfs_iodwant[i] = (struct proc *)0;
-                       wakeup((caddr_t)&nfs_iodwant[i]);
-                       break;
-               }
-       }
-       if (!fnd)
-               error = nfs_doio(bp);
+       if ((bp->b_flags & B_ASYNC) == 0 ||
+               nfs_asyncio(bp, NOCRED))
+               error = nfs_doio(bp, cr, p);
        return (error);
 }
 
 /*
        return (error);
 }
 
 /*
- * Fun and games with i/o
- * Essentially play ubasetup() and disk interrupt service routine by
- * mapping the data buffer into kernel virtual space and doing the
- * nfs read or write rpc's from it.
- * If the biod's are not running, this is just called from nfs_strategy(),
- * otherwise it is called by the biod's to do what would normally be
- * partially disk interrupt driven.
+ * Mmap a file
+ *
+ * NB Currently unsupported.
  */
  */
-nfs_doio(bp)
-       register struct buf *bp;
+/* ARGSUSED */
+int
+nfs_mmap(ap)
+       struct vop_mmap_args /* {
+               struct vnode *a_vp;
+               int  a_fflags;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;
 {
 {
-       register struct pte *pte, *ppte;
-       register caddr_t vaddr;
-       register struct uio *uiop;
-       register struct vnode *vp;
-       struct nfsnode *np;
-       struct ucred *cr;
-       int npf, npf2;
-       int reg;
-       caddr_t vbase;
-       caddr_t addr;
-       unsigned v;
-       struct proc *rp;
-       int o, error;
-       int bcnt;
-       struct uio uio;
-       struct iovec io;
-
-       vp = bp->b_vp;
-       uiop = &uio;
-       uiop->uio_iov = &io;
-       uiop->uio_iovcnt = 1;
-       uiop->uio_segflg = UIO_SYSSPACE;
-       if (bp->b_flags & B_READ) {
-               io.iov_len = uiop->uio_resid = bp->b_bcount;
-               uiop->uio_offset = bp->b_lblkno * DEV_BSIZE;
-               addr = bp->b_un.b_addr;
-               bcnt = bp->b_bcount;
-       } else {
-               io.iov_len = uiop->uio_resid = bp->b_dirtyend - bp->b_dirtyoff;
-               uiop->uio_offset = (bp->b_lblkno * DEV_BSIZE) + bp->b_dirtyoff;
-               addr = bp->b_un.b_addr+bp->b_dirtyoff;
-               bcnt = bp->b_dirtyend-bp->b_dirtyoff;
-       }
-       /*
-        * For phys i/o, map the b_addr into kernel virtual space using
-        * the Nfsiomap pte's
-        * Also, add a temporary b_rcred for reading using the process's uid
-        * and a guess at a group
-        */
-       if (bp->b_flags & B_PHYS) {
-               VTONFS(vp)->n_flag |= NPAGEDON;
-               bp->b_rcred = cr = crget();
-               rp = (bp->b_flags & B_DIRTY) ? &proc[2] : bp->b_proc;
-               cr->cr_uid = rp->p_uid;
-               cr->cr_gid = 0;         /* Anything ?? */
-               cr->cr_ngroups = 1;
-               o = (int)addr & PGOFSET;
-               npf2 = npf = btoc(bcnt + o);
-               /*
-                * Get some mapping page table entries
-                */
-               while ((reg = rmalloc(nfsmap, (long)npf)) == 0) {
-                       nfsmap_want++;
-                       sleep((caddr_t)&nfsmap_want, PZERO-1);
+
+       return (EINVAL);
+}
+
+/*
+ * Flush all the blocks associated with a vnode.
+ *     Walk through the buffer pool and push any dirty pages
+ *     associated with the vnode.
+ */
+/* ARGSUSED */
+int
+nfs_fsync(ap)
+       struct vop_fsync_args /* {
+               struct vnodeop_desc *a_desc;
+               struct vnode * a_vp;
+               struct ucred * a_cred;
+               int  a_waitfor;
+               struct proc * a_p;
+       } */ *ap;
+{
+       register struct vnode *vp = ap->a_vp;
+       register struct nfsnode *np = VTONFS(vp);
+       register struct buf *bp;
+       struct buf *nbp;
+       struct nfsmount *nmp;
+       int s, error = 0, slptimeo = 0, slpflag = 0;
+
+       nmp = VFSTONFS(vp->v_mount);
+       if (nmp->nm_flag & NFSMNT_INT)
+               slpflag = PCATCH;
+loop:
+       s = splbio();
+       for (bp = vp->v_dirtyblkhd.le_next; bp; bp = nbp) {
+               nbp = bp->b_vnbufs.qe_next;
+               if (bp->b_flags & B_BUSY) {
+                       if (ap->a_waitfor != MNT_WAIT)
+                               continue;
+                       bp->b_flags |= B_WANTED;
+                       error = tsleep((caddr_t)bp, slpflag | (PRIBIO + 1),
+                               "nfsfsync", slptimeo);
+                       splx(s);
+                       if (error) {
+                           if (nfs_sigintr(nmp, (struct nfsreq *)0, ap->a_p))
+                               return (EINTR);
+                           if (slpflag == PCATCH) {
+                               slpflag = 0;
+                               slptimeo = 2 * hz;
+                           }
+                       }
+                       goto loop;
                }
                }
-               reg--;
-               /* I know it is always the else, but that may change someday */
-               if ((bp->b_flags & B_PHYS) == 0)
-                       pte = kvtopte(bp->b_un.b_addr);
-               else if (bp->b_flags & B_PAGET)
-                       pte = &Usrptmap[btokmx((struct pte *)bp->b_un.b_addr)];
-               else {
-                       v = btop(bp->b_un.b_addr);
-                       if (bp->b_flags & B_UAREA)
-                               pte = &rp->p_addr[v];
-                       else
-                               pte = vtopte(rp, v);
+               if ((bp->b_flags & B_DELWRI) == 0)
+                       panic("nfs_fsync: not dirty");
+               bremfree(bp);
+               bp->b_flags |= B_BUSY;
+               splx(s);
+               bp->b_flags |= B_ASYNC;
+               VOP_BWRITE(bp);
+               goto loop;
+       }
+       splx(s);
+       if (ap->a_waitfor == MNT_WAIT) {
+               while (vp->v_numoutput) {
+                       vp->v_flag |= VBWAIT;
+                       error = tsleep((caddr_t)&vp->v_numoutput,
+                               slpflag | (PRIBIO + 1), "nfsfsync", slptimeo);
+                       if (error) {
+                           if (nfs_sigintr(nmp, (struct nfsreq *)0, ap->a_p))
+                               return (EINTR);
+                           if (slpflag == PCATCH) {
+                               slpflag = 0;
+                               slptimeo = 2 * hz;
+                           }
+                       }
                }
                }
-               /*
-                * Play vmaccess() but with the Nfsiomap page table
-                */
-               ppte = &Nfsiomap[reg];
-               vbase = vaddr = &nfsiobuf[reg*NBPG];
-               while (npf != 0) {
-                       mapin(ppte, (u_int)vaddr, pte->pg_pfnum, (int)(PG_V|PG_KW));
-#if defined(tahoe)
-                       mtpr(P1DC, vaddr);
+               if (vp->v_dirtyblkhd.le_next) {
+#ifdef DIAGNOSTIC
+                       vprint("nfs_fsync: dirty", vp);
 #endif
 #endif
-                       ppte++;
-                       pte++;
-                       vaddr += NBPG;
-                       --npf;
+                       goto loop;
                }
                }
-               io.iov_base = vbase+o;
-       } else {
-               io.iov_base = addr;
        }
        }
-       if (bp->b_flags & B_READ) {
-               uiop->uio_rw = UIO_READ;
-               bp->b_error = error = nfs_readrpc(vp, uiop, bp->b_rcred);
-       } else {
-               uiop->uio_rw = UIO_WRITE;
-               bp->b_error = error = nfs_writerpc(vp, uiop, bp->b_wcred);
-               if (error) {
-                       np = VTONFS(vp);
-                       np->n_error = error;
-                       np->n_flag |= NWRITEERR;
-               }
-               bp->b_dirtyoff = bp->b_dirtyend = 0;
+       if (np->n_flag & NWRITEERR) {
+               error = np->n_error;
+               np->n_flag &= ~NWRITEERR;
        }
        }
-       if (error)
-               bp->b_flags |= B_ERROR;
-       bp->b_resid = uiop->uio_resid;
-       /*
-        * Release pte's used by physical i/o
-        */
-       if (bp->b_flags & B_PHYS) {
-               crfree(cr);
-               rmfree(nfsmap, (long)npf2, (long)++reg);
-               if (nfsmap_want) {
-                       nfsmap_want = 0;
-                       wakeup((caddr_t)&nfsmap_want);
-               }
-       }
-       biodone(bp);
        return (error);
 }
 
 /*
        return (error);
 }
 
 /*
- * Flush all the blocks associated with a vnode.
- *     Walk through the buffer pool and push any dirty pages
- *     associated with the vnode.
+ * Return POSIX pathconf information applicable to nfs.
+ *
+ * Currently the NFS protocol does not support getting such
+ * information from the remote server.
  */
 /* ARGSUSED */
  */
 /* ARGSUSED */
-nfs_fsync(vp, fflags, cred, waitfor)
-       register struct vnode *vp;
-       int fflags;
-       struct ucred *cred;
-       int waitfor;
+nfs_pathconf(ap)
+       struct vop_pathconf_args /* {
+               struct vnode *a_vp;
+               int a_name;
+               int *a_retval;
+       } */ *ap;
+{
+
+       return (EINVAL);
+}
+
+/*
+ * NFS advisory byte-level locks.
+ * Currently unsupported.
+ */
+int
+nfs_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;
 {
 {
+
+       return (EOPNOTSUPP);
+}
+
+/*
+ * Print out the contents of an nfsnode.
+ */
+int
+nfs_print(ap)
+       struct vop_print_args /* {
+               struct vnode *a_vp;
+       } */ *ap;
+{
+       register struct vnode *vp = ap->a_vp;
        register struct nfsnode *np = VTONFS(vp);
        register struct nfsnode *np = VTONFS(vp);
+
+       printf("tag VT_NFS, fileid %d fsid 0x%x",
+               np->n_vattr.va_fileid, np->n_vattr.va_fsid);
+#ifdef FIFO
+       if (vp->v_type == VFIFO)
+               fifo_printinfo(vp);
+#endif /* FIFO */
+       printf("\n");
+}
+
+/*
+ * NFS directory offset lookup.
+ * Currently unsupported.
+ */
+int
+nfs_blkatoff(ap)
+       struct vop_blkatoff_args /* {
+               struct vnode *a_vp;
+               off_t a_offset;
+               char **a_res;
+               struct buf **a_bpp;
+       } */ *ap;
+{
+
+       return (EOPNOTSUPP);
+}
+
+/*
+ * NFS flat namespace allocation.
+ * Currently unsupported.
+ */
+int
+nfs_valloc(ap)
+       struct vop_valloc_args /* {
+               struct vnode *a_pvp;
+               int a_mode;
+               struct ucred *a_cred;
+               struct vnode **a_vpp;
+       } */ *ap;
+{
+
+       return (EOPNOTSUPP);
+}
+
+/*
+ * NFS flat namespace free.
+ * Currently unsupported.
+ */
+int
+nfs_vfree(ap)
+       struct vop_vfree_args /* {
+               struct vnode *a_pvp;
+               ino_t a_ino;
+               int a_mode;
+       } */ *ap;
+{
+
+       return (EOPNOTSUPP);
+}
+
+/*
+ * NFS file truncation.
+ */
+int
+nfs_truncate(ap)
+       struct vop_truncate_args /* {
+               struct vnode *a_vp;
+               off_t a_length;
+               int a_flags;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;
+{
+
+       /* Use nfs_setattr */
+       printf("nfs_truncate: need to implement!!");
+       return (EOPNOTSUPP);
+}
+
+/*
+ * NFS update.
+ */
+int
+nfs_update(ap)
+       struct vop_update_args /* {
+               struct vnode *a_vp;
+               struct timeval *a_ta;
+               struct timeval *a_tm;
+               int a_waitfor;
+       } */ *ap;
+{
+
+       /* Use nfs_setattr */
+       printf("nfs_update: need to implement!!");
+       return (EOPNOTSUPP);
+}
+
+/*
+ * nfs special file access vnode op.
+ * Essentially just get vattr and then imitate iaccess() since the device is
+ * local to the client.
+ */
+int
+nfsspec_access(ap)
+       struct vop_access_args /* {
+               struct vnode *a_vp;
+               int  a_mode;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;
+{
+       register struct vattr *vap;
+       register gid_t *gp;
+       register struct ucred *cred = ap->a_cred;
+       mode_t mode = ap->a_mode;
+       struct vattr vattr;
+       register int i;
        int error;
 
        int error;
 
-       if (np->n_flag & NMODIFIED) {
-               np->n_flag &= ~NMODIFIED;
-               error = nfs_blkflush(vp, (daddr_t)0, np->n_size, FALSE);
+       /*
+        * If you're the super-user,
+        * you always get access.
+        */
+       if (cred->cr_uid == 0)
+               return (0);
+       vap = &vattr;
+       if (error = VOP_GETATTR(ap->a_vp, vap, cred, ap->a_p))
+               return (error);
+       /*
+        * Access check is based on only one of owner, group, public.
+        * If not owner, then check group. If not a member of the
+        * group, then check public access.
+        */
+       if (cred->cr_uid != vap->va_uid) {
+               mode >>= 3;
+               gp = cred->cr_groups;
+               for (i = 0; i < cred->cr_ngroups; i++, gp++)
+                       if (vap->va_gid == *gp)
+                               goto found;
+               mode >>= 3;
+found:
+               ;
        }
        }
-       return (error);
+       return ((vap->va_mode & mode) == mode ? 0 : EACCES);
 }
 
 /*
 }
 
 /*
- * Print out the contents of an nfsnode.
+ * Read wrapper for special devices.
  */
  */
-nfs_print(vp)
-       struct vnode *vp;
+int
+nfsspec_read(ap)
+       struct vop_read_args /* {
+               struct vnode *a_vp;
+               struct uio *a_uio;
+               int  a_ioflag;
+               struct ucred *a_cred;
+       } */ *ap;
 {
 {
+       register struct nfsnode *np = VTONFS(ap->a_vp);
+
+       /*
+        * Set access flag.
+        */
+       np->n_flag |= NACC;
+       np->n_atim = time;
+       return (VOCALL(spec_vnodeop_p, VOFFSET(vop_read), ap));
+}
+
+/*
+ * Write wrapper for special devices.
+ */
+int
+nfsspec_write(ap)
+       struct vop_write_args /* {
+               struct vnode *a_vp;
+               struct uio *a_uio;
+               int  a_ioflag;
+               struct ucred *a_cred;
+       } */ *ap;
+{
+       register struct nfsnode *np = VTONFS(ap->a_vp);
+
+       /*
+        * Set update flag.
+        */
+       np->n_flag |= NUPD;
+       np->n_mtim = time;
+       return (VOCALL(spec_vnodeop_p, VOFFSET(vop_write), ap));
+}
+
+/*
+ * Close wrapper for special devices.
+ *
+ * Update the times on the nfsnode then do device close.
+ */
+int
+nfsspec_close(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 nfsnode *np = VTONFS(vp);
        register struct nfsnode *np = VTONFS(vp);
+       struct vattr vattr;
+
+       if (np->n_flag & (NACC | NUPD)) {
+               np->n_flag |= NCHG;
+               if (vp->v_usecount == 1 &&
+                   (vp->v_mount->mnt_flag & MNT_RDONLY) == 0) {
+                       VATTR_NULL(&vattr);
+                       if (np->n_flag & NACC) {
+                               vattr.va_atime.ts_sec = np->n_atim.tv_sec;
+                               vattr.va_atime.ts_nsec =
+                                   np->n_atim.tv_usec * 1000;
+                       }
+                       if (np->n_flag & NUPD) {
+                               vattr.va_mtime.ts_sec = np->n_mtim.tv_sec;
+                               vattr.va_mtime.ts_nsec =
+                                   np->n_mtim.tv_usec * 1000;
+                       }
+                       (void)VOP_SETATTR(vp, &vattr, ap->a_cred, ap->a_p);
+               }
+       }
+       return (VOCALL(spec_vnodeop_p, VOFFSET(vop_close), ap));
+}
+
+#ifdef FIFO
+/*
+ * Read wrapper for fifos.
+ */
+int
+nfsfifo_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)();
+       register struct nfsnode *np = VTONFS(ap->a_vp);
+
+       /*
+        * Set access flag.
+        */
+       np->n_flag |= NACC;
+       np->n_atim = time;
+       return (VOCALL(fifo_vnodeop_p, VOFFSET(vop_read), ap));
+}
 
 
-       printf("tag VT_NFS, fileid %d fsid 0x%x%s\n",
-               np->n_vattr.va_fileid, np->n_vattr.va_fsid,
-               (np->n_flag & NLOCKED) ? " (LOCKED)" : "");
+/*
+ * Write wrapper for fifos.
+ */
+int
+nfsfifo_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)();
+       register struct nfsnode *np = VTONFS(ap->a_vp);
+
+       /*
+        * Set update flag.
+        */
+       np->n_flag |= NUPD;
+       np->n_mtim = time;
+       return (VOCALL(fifo_vnodeop_p, VOFFSET(vop_write), ap));
+}
+
+/*
+ * Close wrapper for fifos.
+ *
+ * Update the times on the nfsnode then do fifo close.
+ */
+int
+nfsfifo_close(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 nfsnode *np = VTONFS(vp);
+       struct vattr vattr;
+       extern int (**fifo_vnodeop_p)();
+
+       if (np->n_flag & (NACC | NUPD)) {
+               if (np->n_flag & NACC)
+                       np->n_atim = time;
+               if (np->n_flag & NUPD)
+                       np->n_mtim = time;
+               np->n_flag |= NCHG;
+               if (vp->v_usecount == 1 &&
+                   (vp->v_mount->mnt_flag & MNT_RDONLY) == 0) {
+                       VATTR_NULL(&vattr);
+                       if (np->n_flag & NACC) {
+                               vattr.va_atime.ts_sec = np->n_atim.tv_sec;
+                               vattr.va_atime.ts_nsec =
+                                   np->n_atim.tv_usec * 1000;
+                       }
+                       if (np->n_flag & NUPD) {
+                               vattr.va_mtime.ts_sec = np->n_mtim.tv_sec;
+                               vattr.va_mtime.ts_nsec =
+                                   np->n_mtim.tv_usec * 1000;
+                       }
+                       (void)VOP_SETATTR(vp, &vattr, ap->a_cred, ap->a_p);
+               }
+       }
+       return (VOCALL(fifo_vnodeop_p, VOFFSET(vop_close), ap));
 }
 }
+#endif /* FIFO */