X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fafs%2Fafs_nfsdisp.c;h=5260b3db03a1cdbb4e8cfb123dadbe2e5e002e02;hp=16c15852f5bcb958c8cdd6b521db717bd5ea983d;hb=31dd436712c7119a0bcb0ad534b7e9e6304dd298;hpb=b67317fa07fa4c1df6818d623c6dec48418bb6ba

diff --git a/src/afs/afs_nfsdisp.c b/src/afs/afs_nfsdisp.c
index 16c1585..5260b3d 100644
--- a/src/afs/afs_nfsdisp.c
+++ b/src/afs/afs_nfsdisp.c
@@ -10,13 +10,14 @@
 #include <afsconfig.h>
 #include "afs/param.h"
 
-RCSID("$Header$");
+RCSID
+    ("$Header$");
 
 /* Ugly Ugly Ugly  but precludes conflicting XDR macros; We want kernel xdr */
 #define __XDR_INCLUDE__
 #include "afs/stds.h"
-#include "afs/sysincludes.h" /* Standard vendor system headers */
-#if defined(AFS_SUN55_ENV) && !defined(AFS_NONFSTRANS) 
+#include "afs/sysincludes.h"	/* Standard vendor system headers */
+#if defined(AFS_SUN55_ENV) && !defined(AFS_NONFSTRANS)
 #include "rpc/types.h"
 #include "rpc/auth.h"
 #include "rpc/auth_unix.h"
@@ -31,31 +32,31 @@ RCSID("$Header$");
 #include "nfs/export.h"
 #include "nfs/nfs_clnt.h"
 #include "nfs/nfs_acl.h"
-#include "afs/afsincludes.h"	
-#include "afs/afs_stats.h"   
+#include "afs/afsincludes.h"
+#include "afs/afs_stats.h"
 #include "afs/exporter.h"
 
-static int xlatorinit_v2_done=0;
-static int xlatorinit_v3_done=0;
+static int xlatorinit_v2_done = 0;
+static int xlatorinit_v3_done = 0;
 extern int afs_nobody;
 extern int afs_NFSRootOnly;
 
 struct rfs_disp_tbl {
-    void (*dis_proc)();
+    void (*dis_proc) ();
     xdrproc_t dis_xdrargs;
     xdrproc_t dis_fastxdrargs;
-    int       dis_argsz;           
-    xdrproc_t dis_xdrres;          
-    xdrproc_t dis_fastxdrres;      
-    int       dis_ressz;           
-    void      (*dis_resfree)();    
-    int       dis_flags;
-    fhandle_t (*dis_getfh)();      
+    int dis_argsz;
+    xdrproc_t dis_xdrres;
+    xdrproc_t dis_fastxdrres;
+    int dis_ressz;
+    void (*dis_resfree) ();
+    int dis_flags;
+      fhandle_t(*dis_getfh) ();
 };
 
 struct afs_nfs_disp_tbl {
-    void (*afs_proc)();
-    void (*orig_proc)();
+    void (*afs_proc) ();
+    void (*orig_proc) ();
 };
 struct afs_nfs2_resp {
     enum nfsstat status;
@@ -68,107 +69,109 @@ struct afs_nfs_disp_tbl afs_rfs_disp_tbl[RFS_NPROC];
 struct afs_nfs_disp_tbl afs_acl_disp_tbl[ACL2_NPROC];
 
 static int
-is_afs_fh(fhandle_t *fhp) {
-    if ((fhp->fh_fsid.val[0] == AFS_VFSMAGIC) &&
-	(fhp->fh_fsid.val[1] == AFS_VFSFSID))
+is_afs_fh(fhandle_t * fhp)
+{
+    if ((fhp->fh_fsid.val[0] == AFS_VFSMAGIC)
+	&& (fhp->fh_fsid.val[1] == AFS_VFSFSID))
 	return 1;
     return 0;
 }
 
 afs_int32
-nfs2_to_afs_call(int which, caddr_t *args, fhandle_t **fhpp, fhandle_t **fh2pp)
+nfs2_to_afs_call(int which, caddr_t * args, fhandle_t ** fhpp,
+		 fhandle_t ** fh2pp)
 {
     struct vnode *vp;
-    fhandle_t *fhp1=0;
-    fhandle_t *fhp2=0;
+    fhandle_t *fhp1 = 0;
+    fhandle_t *fhp2 = 0;
     int errorcode;
-    
+
     afs_Trace1(afs_iclSetp, CM_TRACE_NFSIN, ICL_TYPE_INT32, which);
-    *fh2pp = (fhandle_t *)0;
+    *fh2pp = (fhandle_t *) 0;
     switch (which) {
     case RFS_GETATTR:
     case RFS_READLINK:
     case RFS_STATFS:
-	fhp1 = (fhandle_t *)args;
+	fhp1 = (fhandle_t *) args;
 	break;
     case RFS_SETATTR:
-    {
-	struct nfssaargs *sargs = (struct nfssaargs *)args;
-	fhp1 = (fhandle_t *)&sargs->saa_fh;
-	break;
-    }
+	{
+	    struct nfssaargs *sargs = (struct nfssaargs *)args;
+	    fhp1 = (fhandle_t *) & sargs->saa_fh;
+	    break;
+	}
     case RFS_LOOKUP:
-    {
-	struct nfsdiropargs *sargs = (struct nfsdiropargs *)args;
-	fhp1 = (fhandle_t *)&sargs->da_fhandle;
-	break;
-    }
+	{
+	    struct nfsdiropargs *sargs = (struct nfsdiropargs *)args;
+	    fhp1 = sargs->da_fhandle;
+	    break;
+	}
     case RFS_READ:
-    {
-	struct nfsreadargs *sargs = (struct nfsreadargs *)args;
-	fhp1 = (fhandle_t *)&sargs->ra_fhandle;
-	break;
-    }
+	{
+	    struct nfsreadargs *sargs = (struct nfsreadargs *)args;
+	    fhp1 = (fhandle_t *) & sargs->ra_fhandle;
+	    break;
+	}
     case RFS_WRITE:
-    {
-	struct nfswriteargs *sargs = (struct nfswriteargs *)args;
-	fhp1 = (fhandle_t *)&sargs->wa_fhandle;
-	break;
-    }
+	{
+	    struct nfswriteargs *sargs = (struct nfswriteargs *)args;
+	    fhp1 = (fhandle_t *) & sargs->wa_fhandle;
+	    break;
+	}
     case RFS_CREATE:
-    {
-	struct nfscreatargs *sargs = (struct nfscreatargs *)args;
-	fhp1 = (fhandle_t *)&sargs->ca_da.da_fhandle;
-	break;
-    }
+	{
+	    struct nfscreatargs *sargs = (struct nfscreatargs *)args;
+	    fhp1 = sargs->ca_da.da_fhandle;
+	    break;
+	}
     case RFS_REMOVE:
-    {
-	struct nfsdiropargs *sargs = (struct nfsdiropargs *)args;
-	fhp1 = (fhandle_t *)&sargs->da_fhandle;
-	break;
-    }
+	{
+	    struct nfsdiropargs *sargs = (struct nfsdiropargs *)args;
+	    fhp1 = sargs->da_fhandle;
+	    break;
+	}
     case RFS_RENAME:
-    {
-	struct nfsrnmargs *sargs = (struct nfsrnmargs *)args;
-	fhp1 = (fhandle_t *)&sargs->rna_from.da_fhandle;
-	fhp2 = (fhandle_t *)&sargs->rna_to.da_fhandle;
-	break;
-    }
+	{
+	    struct nfsrnmargs *sargs = (struct nfsrnmargs *)args;
+	    fhp1 = sargs->rna_from.da_fhandle;
+	    fhp2 = sargs->rna_to.da_fhandle;
+	    break;
+	}
     case RFS_LINK:
-    {
-	struct nfslinkargs *sargs = (struct nfslinkargs *)args;
-	fhp1 = (fhandle_t *)&sargs->la_from;
-	fhp2 = (fhandle_t *)&sargs->la_to.da_fhandle;
-	break;
-    }
+	{
+	    struct nfslinkargs *sargs = (struct nfslinkargs *)args;
+	    fhp1 = sargs->la_from;
+	    fhp2 = sargs->la_to.da_fhandle;
+	    break;
+	}
     case RFS_SYMLINK:
-    {
-	struct nfsslargs *sargs = (struct nfsslargs *)args;
-	fhp1 = (fhandle_t *)&sargs->sla_from.da_fhandle;
-	break;
-    }
+	{
+	    struct nfsslargs *sargs = (struct nfsslargs *)args;
+	    fhp1 = sargs->sla_from.da_fhandle;
+	    break;
+	}
     case RFS_MKDIR:
-    {
-	struct nfscreatargs *sargs = (struct nfscreatargs *)args;
-	fhp1 = (fhandle_t *)&sargs->ca_da.da_fhandle;
-	break;
-    }
+	{
+	    struct nfscreatargs *sargs = (struct nfscreatargs *)args;
+	    fhp1 = sargs->ca_da.da_fhandle;
+	    break;
+	}
     case RFS_RMDIR:
-    {
-	struct nfsdiropargs *sargs = (struct nfsdiropargs *)args;
-	fhp1 = (fhandle_t *)&sargs->da_fhandle;
-	break;
-    }
+	{
+	    struct nfsdiropargs *sargs = (struct nfsdiropargs *)args;
+	    fhp1 = sargs->da_fhandle;
+	    break;
+	}
     case RFS_READDIR:
-    {
-	struct nfsrddirargs *sargs = (struct nfsrddirargs *)args;
-	fhp1 = (fhandle_t *)&sargs->rda_fh;
-	break;
-    }
+	{
+	    struct nfsrddirargs *sargs = (struct nfsrddirargs *)args;
+	    fhp1 = (fhandle_t *) & sargs->rda_fh;
+	    break;
+	}
     default:
 	return NULL;
     }
-    
+
     /* Ok if arg 1 is in AFS or if 2 args and arg 2 is in AFS */
     if (is_afs_fh(fhp1)) {
 	*fhpp = fhp1;
@@ -185,70 +188,70 @@ nfs2_to_afs_call(int which, caddr_t *args, fhandle_t **fhpp, fhandle_t **fh2pp)
 }
 
 afs_int32
-acl2_to_afs_call(int which, caddr_t *args, fhandle_t **fhpp)
+acl2_to_afs_call(int which, caddr_t * args, fhandle_t ** fhpp)
 {
     fhandle_t *fhp;
-    
-    switch(which) {
+
+    switch (which) {
     case ACLPROC2_NULL:
-    {
-	return NULL;
-    }
+	{
+	    return NULL;
+	}
     case ACLPROC2_GETACL:
-    {
-	struct GETACL2args *sargs = (struct GETACL2args *) args;
-	fhp = &sargs->fh;
-	break;
-    }
+	{
+	    struct GETACL2args *sargs = (struct GETACL2args *)args;
+	    fhp = &sargs->fh;
+	    break;
+	}
     case ACLPROC2_SETACL:
-    {
-	struct SETACL2args *sargs = (struct SETACL2args *) args;
-	fhp = &sargs->fh;
-	break;
-    }
+	{
+	    struct SETACL2args *sargs = (struct SETACL2args *)args;
+	    fhp = &sargs->fh;
+	    break;
+	}
     case ACLPROC2_GETATTR:
-    {
-	struct GETATTR2args *sargs = (struct GETATTR2args *) args;
-	fhp = &sargs->fh;
-	break;
-    }
+	{
+	    struct GETATTR2args *sargs = (struct GETATTR2args *)args;
+	    fhp = &sargs->fh;
+	    break;
+	}
     case ACLPROC2_ACCESS:
-    {
-	struct ACCESS2args *sargs = (struct ACCESS2args *) args;
-	fhp = &sargs->fh;
-	break;
-    }
+	{
+	    struct ACCESS2args *sargs = (struct ACCESS2args *)args;
+	    fhp = &sargs->fh;
+	    break;
+	}
     default:
 	return NULL;
     }
-    
+
     if (is_afs_fh(fhp)) {
 	*fhpp = fhp;
 	return 1;
     }
-    
+
     return NULL;
 }
 
 int
 afs_nfs2_dispatcher(int type, afs_int32 which, char *argp,
-                    struct exportinfo **expp,
-                    struct svc_req *rp, struct AFS_UCRED *crp)
+		    struct exportinfo **expp, struct svc_req *rp,
+		    struct AFS_UCRED *crp)
 {
     afs_int32 call = 0;
     afs_int32 code = 0;
     afs_int32 client = 0;
     struct sockaddr *sa;
-    fhandle_t *fh = (fhandle_t *)argp;
-    fhandle_t *fh2 = (fhandle_t *)0;
-    
+    fhandle_t *fh = (fhandle_t *) argp;
+    fhandle_t *fh2 = (fhandle_t *) 0;
+
     if (!xlatorinit_v2_done)
 	return 2;
-    
+
     sa = (struct sockaddr *)svc_getrpccaller(rp->rq_xprt)->buf;
     if (sa->sa_family == AF_INET)
 	client = ((struct sockaddr_in *)sa)->sin_addr.s_addr;
-    
+
     AFS_GLOCK();
     code = 0;
     switch (type) {
@@ -261,17 +264,16 @@ afs_nfs2_dispatcher(int type, afs_int32 which, char *argp,
     default:
 	break;
     }
-    
+
     if (code) {
 	struct afs_exporter *out = 0;
 	afs_int32 dummy;
 	static int once = 0;
 	struct SmallFid Sfid;
-	
+
 	memcpy((char *)&Sfid, fh->fh_data, SIZEOF_SMALLFID);
-	
-	afs_Trace2(afs_iclSetp, CM_TRACE_NFSIN1,
-		   ICL_TYPE_POINTER, client,
+
+	afs_Trace2(afs_iclSetp, CM_TRACE_NFSIN1, ICL_TYPE_POINTER, client,
 		   ICL_TYPE_FID, &Sfid);
 
 	/* We ran */
@@ -280,16 +282,17 @@ afs_nfs2_dispatcher(int type, afs_int32 which, char *argp,
 	    afs_nobody = (*expp)->exi_export.ex_anon;
 	    once = 1;
 	}
-	code = afs_nfsclient_reqhandler((struct afs_exporter *)0, &crp,
-					client, &dummy, &out);
-	
+	code =
+	    afs_nfsclient_reqhandler((struct afs_exporter *)0, &crp, client,
+				     &dummy, &out);
+
 	if (!code && out)
 	    EXP_RELE(out);
-	
+
 	if (code == EINVAL)
 	    call = 2;
     }
-    
+
     AFS_GUNLOCK();
     return call;
 }
@@ -297,41 +300,40 @@ afs_nfs2_dispatcher(int type, afs_int32 which, char *argp,
 void
 afs_nfs2_smallfidder(struct nfsdiropres *dr)
 {
-    register fhandle_t *fhp = (fhandle_t *)&dr->dr_fhandle;
+    register fhandle_t *fhp = (fhandle_t *) & dr->dr_fhandle;
     afs_int32 addr[2];
     struct vcache *vcp;
-    
+
 #if defined(AFS_SUN57_64BIT_ENV)
-    /* See also afs_fid() */    
+    /* See also afs_fid() */
     memcpy((char *)addr, fhp->fh_data, SIZEOF_SMALLFID);
     addr[1] = (addr[1] >> 48) & 0xffff;
-#else 
+#else
     memcpy((char *)addr, fhp->fh_data, 2 * sizeof(long));
 #endif
-    
+
     AFS_GLOCK();
-    vcp = VTOAFS((struct vnode*)addr[0]);
-    
-    if (addr[1] == AFS_XLATOR_MAGIC)
-    {
+    vcp = VTOAFS((struct vnode *)addr[0]);
+
+    if (addr[1] == AFS_XLATOR_MAGIC) {
 	if (dr->dr_status == NFS_OK) {
 	    struct SmallFid Sfid;
 	    struct cell *tcell;
-	    
+
 	    /* Make up and copy out a SmallFid */
 	    tcell = afs_GetCell(vcp->fid.Cell, READ_LOCK);
 	    Sfid.Volume = vcp->fid.Fid.Volume;
-	    Sfid.CellAndUnique = ((tcell->cellIndex << 24) |
-				  (vcp->fid.Fid.Unique & 0xffffff));
+	    Sfid.CellAndUnique =
+		((tcell->cellIndex << 24) | (vcp->fid.Fid.Unique & 0xffffff));
 	    afs_PutCell(tcell, READ_LOCK);
-	    Sfid.Vnode = (u_short)(vcp->fid.Fid.Vnode & 0xffff);
+	    Sfid.Vnode = (u_short) (vcp->fid.Fid.Vnode & 0xffff);
 	    fhp->fh_len = SIZEOF_SMALLFID;
-	    memcpy(dr->dr_fhandle.fh_data, (char*)&Sfid, fhp->fh_len);
+	    memcpy(dr->dr_fhandle.fh_data, (char *)&Sfid, fhp->fh_len);
 
 	    afs_Trace3(afs_iclSetp, CM_TRACE_NFSOUT, ICL_TYPE_INT32, 0,
-                       ICL_TYPE_POINTER, vcp, ICL_TYPE_FID, &Sfid);
+		       ICL_TYPE_POINTER, vcp, ICL_TYPE_FID, &Sfid);
 	}
-	
+
 	/* If we have a ref, release it */
 	if (vcp->vrefCount >= 1)
 	    AFS_RELE(AFSTOV(vcp));
@@ -345,7 +347,8 @@ afs_nfs2_noaccess(struct afs_nfs2_resp *resp)
     resp->status = NFSERR_ACCES;
 }
 
-void afs_nfs2_null(char *args, char *xp, char *exp, char *rp, char *crp)
+void
+afs_nfs2_null(char *args, char *xp, char *exp, char *rp, char *crp)
 {
 }
 
@@ -359,262 +362,353 @@ afs_nfs2_writecache(char *args, char *xp, char *exp, char *rp, char *crp)
 {
 }
 
-void afs_nfs2_getattr(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_GETATTR, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_rfs_disp_tbl[RFS_GETATTR].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_getattr(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_GETATTR, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_rfs_disp_tbl[RFS_GETATTR].orig_proc) (args, xp, exp, rp, crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_setattr(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_SETATTR, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_rfs_disp_tbl[RFS_SETATTR].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_setattr(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_SETATTR, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_rfs_disp_tbl[RFS_SETATTR].orig_proc) (args, xp, exp, rp, crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_lookup(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_LOOKUP, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else { (*afs_rfs_disp_tbl[RFS_LOOKUP].orig_proc)(args, xp, exp, rp, crp); 
-    if (afs_NFSRootOnly && call) afs_nfs2_smallfidder(xp); } 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_lookup(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_LOOKUP, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else {
+	(*afs_rfs_disp_tbl[RFS_LOOKUP].orig_proc) (args, xp, exp, rp, crp);
+	if (afs_NFSRootOnly && call)
+	    afs_nfs2_smallfidder(xp);
+    }
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_readlink(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_READLINK, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_rfs_disp_tbl[RFS_READLINK].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_readlink(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_READLINK, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_rfs_disp_tbl[RFS_READLINK].orig_proc) (args, xp, exp, rp, crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_read(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_READ, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_rfs_disp_tbl[RFS_READ].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_read(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_READ, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_rfs_disp_tbl[RFS_READ].orig_proc) (args, xp, exp, rp, crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_write(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_WRITE, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_rfs_disp_tbl[RFS_WRITE].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_write(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_WRITE, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_rfs_disp_tbl[RFS_WRITE].orig_proc) (args, xp, exp, rp, crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_create(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_CREATE, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else { (*afs_rfs_disp_tbl[RFS_CREATE].orig_proc)(args, xp, exp, rp, crp); 
-    if (afs_NFSRootOnly && call) afs_nfs2_smallfidder(xp); } 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_create(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_CREATE, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else {
+	(*afs_rfs_disp_tbl[RFS_CREATE].orig_proc) (args, xp, exp, rp, crp);
+	if (afs_NFSRootOnly && call)
+	    afs_nfs2_smallfidder(xp);
+    }
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_remove(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_REMOVE, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_rfs_disp_tbl[RFS_REMOVE].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_remove(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_REMOVE, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_rfs_disp_tbl[RFS_REMOVE].orig_proc) (args, xp, exp, rp, crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_rename(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_RENAME, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_rfs_disp_tbl[RFS_RENAME].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_rename(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_RENAME, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_rfs_disp_tbl[RFS_RENAME].orig_proc) (args, xp, exp, rp, crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_link(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_LINK, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_rfs_disp_tbl[RFS_LINK].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_link(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_LINK, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_rfs_disp_tbl[RFS_LINK].orig_proc) (args, xp, exp, rp, crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_symlink(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_SYMLINK, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_rfs_disp_tbl[RFS_SYMLINK].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_symlink(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_SYMLINK, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_rfs_disp_tbl[RFS_SYMLINK].orig_proc) (args, xp, exp, rp, crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_mkdir(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_MKDIR, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else { (*afs_rfs_disp_tbl[RFS_MKDIR].orig_proc)(args, xp, exp, rp, crp); 
-    if (afs_NFSRootOnly && call) afs_nfs2_smallfidder(xp); } 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_mkdir(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_MKDIR, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else {
+	(*afs_rfs_disp_tbl[RFS_MKDIR].orig_proc) (args, xp, exp, rp, crp);
+	if (afs_NFSRootOnly && call)
+	    afs_nfs2_smallfidder(xp);
+    }
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_rmdir(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_RMDIR, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_rfs_disp_tbl[RFS_RMDIR].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_rmdir(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_RMDIR, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_rfs_disp_tbl[RFS_RMDIR].orig_proc) (args, xp, exp, rp, crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_readdir(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_READDIR, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_rfs_disp_tbl[RFS_READDIR].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_readdir(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_READDIR, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_rfs_disp_tbl[RFS_READDIR].orig_proc) (args, xp, exp, rp, crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs2_statfs(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(0, RFS_STATFS, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_rfs_disp_tbl[RFS_STATFS].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs2_statfs(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs2_dispatcher(0, RFS_STATFS, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_rfs_disp_tbl[RFS_STATFS].orig_proc) (args, xp, exp, rp, crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
 struct afs_nfs_disp_tbl afs_rfs_disp_tbl[RFS_NPROC] = {
-    { afs_nfs2_null },
-    { afs_nfs2_getattr },
-    { afs_nfs2_setattr },
-    { afs_nfs2_root },
-    { afs_nfs2_lookup },
-    { afs_nfs2_readlink },
-    { afs_nfs2_read },
-    { afs_nfs2_writecache },
-    { afs_nfs2_write },
-    { afs_nfs2_create },
-    { afs_nfs2_remove },
-    { afs_nfs2_rename },
-    { afs_nfs2_link },
-    { afs_nfs2_symlink },
-    { afs_nfs2_mkdir },
-    { afs_nfs2_rmdir },
-    { afs_nfs2_readdir },
-    { afs_nfs2_statfs }
+    {afs_nfs2_null},
+    {afs_nfs2_getattr},
+    {afs_nfs2_setattr},
+    {afs_nfs2_root},
+    {afs_nfs2_lookup},
+    {afs_nfs2_readlink},
+    {afs_nfs2_read},
+    {afs_nfs2_writecache},
+    {afs_nfs2_write},
+    {afs_nfs2_create},
+    {afs_nfs2_remove},
+    {afs_nfs2_rename},
+    {afs_nfs2_link},
+    {afs_nfs2_symlink},
+    {afs_nfs2_mkdir},
+    {afs_nfs2_rmdir},
+    {afs_nfs2_readdir},
+    {afs_nfs2_statfs}
 };
 
-void afs_acl2_getacl(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(1, ACLPROC2_GETACL, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_acl_disp_tbl[ACLPROC2_GETACL].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_acl2_getacl(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs2_dispatcher(1, ACLPROC2_GETACL, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_acl_disp_tbl[ACLPROC2_GETACL].orig_proc) (args, xp, exp, rp,
+							crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_acl2_setacl(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(1, ACLPROC2_SETACL, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_acl_disp_tbl[ACLPROC2_SETACL].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_acl2_setacl(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs2_dispatcher(1, ACLPROC2_SETACL, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_acl_disp_tbl[ACLPROC2_SETACL].orig_proc) (args, xp, exp, rp,
+							crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_acl2_getattr(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(1, ACLPROC2_GETATTR, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_acl_disp_tbl[ACLPROC2_GETATTR].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_acl2_getattr(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs2_dispatcher(1, ACLPROC2_GETATTR, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_acl_disp_tbl[ACLPROC2_GETATTR].orig_proc) (args, xp, exp, rp,
+							 crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_acl2_access(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs2_dispatcher(1, ACLPROC2_ACCESS, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); 
-    else (*afs_acl_disp_tbl[ACLPROC2_ACCESS].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_acl2_access(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs2_dispatcher(1, ACLPROC2_ACCESS, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs2_noaccess((struct afs_nfs2_resp *)xp);
+    else
+	(*afs_acl_disp_tbl[ACLPROC2_ACCESS].orig_proc) (args, xp, exp, rp,
+							crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
 struct afs_nfs_disp_tbl afs_acl_disp_tbl[5] = {
-    { afs_nfs2_null },
-    { afs_acl2_getacl },
-    { afs_acl2_setacl },
-    { afs_acl2_getattr },
-    { afs_acl2_access }
+    {afs_nfs2_null},
+    {afs_acl2_getacl},
+    {afs_acl2_setacl},
+    {afs_acl2_getattr},
+    {afs_acl2_access}
 };
 
 /* Munge the dispatch tables to link us in first */
 void
 afs_xlatorinit_v2(struct rfs_disp_tbl *_rfs_tbl,
-                  struct rfs_disp_tbl *_acl_tbl)
+		  struct rfs_disp_tbl *_acl_tbl)
 {
     int i;
-    
-    if (xlatorinit_v2_done++) return;
-    
-    for (i=0; i < RFS_NPROC; i++) {
+
+    if (xlatorinit_v2_done++)
+	return;
+
+    for (i = 0; i < RFS_NPROC; i++) {
 	afs_rfs_disp_tbl[i].orig_proc = _rfs_tbl[i].dis_proc;
 	_rfs_tbl[i].dis_proc = afs_rfs_disp_tbl[i].afs_proc;
     }
-    
-    for (i=0; i < 5; i++) {
+
+    for (i = 0; i < 5; i++) {
 	afs_acl_disp_tbl[i].orig_proc = _acl_tbl[i].dis_proc;
 	_acl_tbl[i].dis_proc = afs_acl_disp_tbl[i].afs_proc;
     }
@@ -638,9 +732,10 @@ struct afs_nfs3_resp {
 typedef struct afs_nfs3_resp afs_nfs3_resp;
 
 static int
-is_afs_fh3(nfs_fh3 *fhp) {
-    if ((fhp->fh3_fsid.val[0] == AFS_VFSMAGIC) &&
-	(fhp->fh3_fsid.val[1] == AFS_VFSFSID))
+is_afs_fh3(nfs_fh3 * fhp)
+{
+    if ((fhp->fh3_fsid.val[0] == AFS_VFSMAGIC)
+	&& (fhp->fh3_fsid.val[1] == AFS_VFSFSID))
 	return 1;
     return 0;
 }
@@ -652,149 +747,160 @@ afs_nfs3_noaccess(struct afs_nfs3_resp *resp)
     resp->flags = FALSE;
 }
 
+void
+afs_nfs3_notsupp(struct afs_nfs3_resp *resp)
+{
+    resp->status = NFS3ERR_NOTSUPP;
+    resp->flags = FALSE;
+}
+
 afs_int32
-nfs3_to_afs_call(int which, caddr_t *args, nfs_fh3 **fhpp, nfs_fh3 **fh2pp)
+nfs3_to_afs_call(int which, caddr_t * args, nfs_fh3 ** fhpp, nfs_fh3 ** fh2pp)
 {
     struct vnode *vp;
-    nfs_fh3 *fhp1=0;
-    nfs_fh3 *fhp2=0;
+    nfs_fh3 *fhp1 = 0;
+    nfs_fh3 *fhp2 = 0;
     int errorcode;
-    
+
     afs_Trace1(afs_iclSetp, CM_TRACE_NFS3IN, ICL_TYPE_INT32, which);
-    *fh2pp = (nfs_fh3 *)0;
+    *fh2pp = (nfs_fh3 *) 0;
     switch (which) {
     case NFSPROC3_GETATTR:
-    {
-	GETATTR3args *arg = (GETATTR3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->object;
-	break;
-    }
+	{
+	    GETATTR3args *arg = (GETATTR3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->object;
+	    break;
+	}
     case NFSPROC3_SETATTR:
-    {
-	SETATTR3args *arg = (SETATTR3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->object;
-	break;
-    }
+	{
+	    SETATTR3args *arg = (SETATTR3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->object;
+	    break;
+	}
     case NFSPROC3_LOOKUP:
-    {
-	LOOKUP3args *arg = (LOOKUP3args *)args;
-	fhp1 = (nfs_fh3 *) arg->what.dirp;
-	break;
-    }
+	{
+	    LOOKUP3args *arg = (LOOKUP3args *) args;
+#ifdef AFS_SUN58_ENV
+	    fhp1 = (nfs_fh3 *) arg->what.dirp;
+#else
+	    fhp1 = (nfs_fh3 *) & arg->what.dir;
+#endif
+	    break;
+	}
     case NFSPROC3_ACCESS:
-    {
-	ACCESS3args *arg = (ACCESS3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->object;
-	break;
-    }
+	{
+	    ACCESS3args *arg = (ACCESS3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->object;
+	    break;
+	}
     case NFSPROC3_READLINK:
-    {
-	READLINK3args *arg = (READLINK3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->symlink;
-	break;
-    }
+	{
+	    READLINK3args *arg = (READLINK3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->symlink;
+	    break;
+	}
     case NFSPROC3_READ:
-    {
-	READ3args *arg = (READ3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->file;
-	break;
-    }
+	{
+	    READ3args *arg = (READ3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->file;
+	    break;
+	}
     case NFSPROC3_WRITE:
-    {
-	WRITE3args *arg = (WRITE3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->file;
-	break;
-    }
+	{
+	    WRITE3args *arg = (WRITE3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->file;
+	    break;
+	}
     case NFSPROC3_CREATE:
-    {
-	CREATE3args *arg = (CREATE3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->where.dir;
-	break;
-    }
+	{
+	    CREATE3args *arg = (CREATE3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->where.dir;
+	    break;
+	}
     case NFSPROC3_MKDIR:
-    {
-	MKDIR3args *arg = (MKDIR3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->where.dir;
-	break;
-    }
+	{
+	    MKDIR3args *arg = (MKDIR3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->where.dir;
+	    break;
+	}
     case NFSPROC3_SYMLINK:
-    {
-	SYMLINK3args *arg = (SYMLINK3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->where.dir;
-	break;
-    }
+	{
+	    SYMLINK3args *arg = (SYMLINK3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->where.dir;
+	    break;
+	}
     case NFSPROC3_MKNOD:
-    {
-	MKNOD3args *arg = (MKNOD3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->where.dir;
-	break;
-    }
+	{
+	    MKNOD3args *arg = (MKNOD3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->where.dir;
+	    break;
+	}
     case NFSPROC3_REMOVE:
-    {
-	REMOVE3args *arg = (REMOVE3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->object.dir;
-	break;
-    }
+	{
+	    REMOVE3args *arg = (REMOVE3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->object.dir;
+	    break;
+	}
     case NFSPROC3_RMDIR:
-    {
-	RMDIR3args *arg = (RMDIR3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->object.dir;
-	break;
-    }
+	{
+	    RMDIR3args *arg = (RMDIR3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->object.dir;
+	    break;
+	}
     case NFSPROC3_RENAME:
-    {
-	RENAME3args *arg = (RENAME3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->from.dir;
-	fhp2 = (nfs_fh3 *) &arg->to.dir;
-	break;
-    }
+	{
+	    RENAME3args *arg = (RENAME3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->from.dir;
+	    fhp2 = (nfs_fh3 *) & arg->to.dir;
+	    break;
+	}
     case NFSPROC3_LINK:
-    {
-	LINK3args *arg = (LINK3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->file;
-	fhp2 = (nfs_fh3 *) &arg->link.dir;
-	break;
-    }
+	{
+	    LINK3args *arg = (LINK3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->file;
+	    fhp2 = (nfs_fh3 *) & arg->link.dir;
+	    break;
+	}
     case NFSPROC3_READDIR:
-    {
-	READDIR3args *arg = (READDIR3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->dir;
-	break;
-    }
+	{
+	    READDIR3args *arg = (READDIR3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->dir;
+	    break;
+	}
     case NFSPROC3_READDIRPLUS:
-    {
-	READDIRPLUS3args *arg = (READDIRPLUS3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->dir;
-	break;
-    }
+	{
+	    READDIRPLUS3args *arg = (READDIRPLUS3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->dir;
+	    break;
+	}
     case NFSPROC3_FSSTAT:
-    {
-	FSSTAT3args *arg = (FSSTAT3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->fsroot;
-	break;
-    }
+	{
+	    FSSTAT3args *arg = (FSSTAT3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->fsroot;
+	    break;
+	}
     case NFSPROC3_FSINFO:
-    {
-	FSINFO3args *arg = (FSINFO3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->fsroot;
-	break;
-    }
+	{
+	    FSINFO3args *arg = (FSINFO3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->fsroot;
+	    break;
+	}
     case NFSPROC3_PATHCONF:
-    {
-	PATHCONF3args *arg = (PATHCONF3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->object;
-	break;
-    }
+	{
+	    PATHCONF3args *arg = (PATHCONF3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->object;
+	    break;
+	}
     case NFSPROC3_COMMIT:
-    {
-	COMMIT3args *arg = (COMMIT3args *)args;
-	fhp1 = (nfs_fh3 *) &arg->file;
-	break;
-    }
+	{
+	    COMMIT3args *arg = (COMMIT3args *) args;
+	    fhp1 = (nfs_fh3 *) & arg->file;
+	    break;
+	}
     default:
 	return NULL;
     }
-    
+
     if (is_afs_fh3(fhp1)) {
 	*fhpp = fhp1;
 	if (fhp2)
@@ -810,54 +916,54 @@ nfs3_to_afs_call(int which, caddr_t *args, nfs_fh3 **fhpp, nfs_fh3 **fh2pp)
 }
 
 afs_int32
-acl3_to_afs_call(int which, caddr_t *args, nfs_fh3 **fhpp)
+acl3_to_afs_call(int which, caddr_t * args, nfs_fh3 ** fhpp)
 {
     nfs_fh3 *fhp;
-    
-    switch(which) {
+
+    switch (which) {
     case ACLPROC3_GETACL:
-    {
-	struct GETACL3args *sargs = (struct GETACL3args *) args;
-	fhp = &sargs->fh;
-	break;
-    }
+	{
+	    struct GETACL3args *sargs = (struct GETACL3args *)args;
+	    fhp = &sargs->fh;
+	    break;
+	}
     case ACLPROC3_SETACL:
-    {
-	struct SETACL3args *sargs = (struct SETACL3args *) args;
-	fhp = &sargs->fh;
-	break;
-    }
+	{
+	    struct SETACL3args *sargs = (struct SETACL3args *)args;
+	    fhp = &sargs->fh;
+	    break;
+	}
     default:
 	return NULL;
     }
-    
+
     if (is_afs_fh3(fhp)) {
 	*fhpp = fhp;
 	return 1;
     }
-    
+
     return NULL;
 }
 
 int
 afs_nfs3_dispatcher(int type, afs_int32 which, char *argp,
-                    struct exportinfo **expp,
-                    struct svc_req *rp, struct AFS_UCRED *crp)
+		    struct exportinfo **expp, struct svc_req *rp,
+		    struct AFS_UCRED *crp)
 {
     afs_int32 call = 0;
     afs_int32 code = 0;
     afs_int32 client = 0;
     struct sockaddr *sa;
-    nfs_fh3 *fh = (nfs_fh3 *)argp;
-    nfs_fh3 *fh2 = (nfs_fh3 *)0;
-    
+    nfs_fh3 *fh = (nfs_fh3 *) argp;
+    nfs_fh3 *fh2 = (nfs_fh3 *) 0;
+
     if (!xlatorinit_v3_done)
 	return 2;
-    
+
     sa = (struct sockaddr *)svc_getrpccaller(rp->rq_xprt)->buf;
-    if (sa->sa_family == AF_INET) 
+    if (sa->sa_family == AF_INET)
 	client = ((struct sockaddr_in *)sa)->sin_addr.s_addr;
-    
+
     AFS_GLOCK();
     code = 0;
     switch (type) {
@@ -870,17 +976,16 @@ afs_nfs3_dispatcher(int type, afs_int32 which, char *argp,
     default:
 	break;
     }
-    
+
     if (code) {
 	struct afs_exporter *out = 0;
 	afs_int32 dummy;
 	static int once = 0;
 	struct SmallFid Sfid;
-	
+
 	memcpy((char *)&Sfid, fh->fh3_data, SIZEOF_SMALLFID);
-	
-	afs_Trace2(afs_iclSetp, CM_TRACE_NFS3IN1,
-		   ICL_TYPE_INT32, client,
+
+	afs_Trace2(afs_iclSetp, CM_TRACE_NFS3IN1, ICL_TYPE_INT32, client,
 		   ICL_TYPE_FID, &Sfid);
 
 	call = 1;
@@ -888,17 +993,18 @@ afs_nfs3_dispatcher(int type, afs_int32 which, char *argp,
 	    afs_nobody = (*expp)->exi_export.ex_anon;
 	    once = 1;
 	}
-	code = afs_nfsclient_reqhandler((struct afs_exporter *)0, &crp,
-					client, &dummy, &out);
-	
+	code =
+	    afs_nfsclient_reqhandler((struct afs_exporter *)0, &crp, client,
+				     &dummy, &out);
+
 	if (!code && out)
 	    EXP_RELE(out);
-	
-	
+
+
 	if (code == EINVAL)
 	    call = 2;
     }
-    
+
     AFS_GUNLOCK();
     return call;
 }
@@ -908,39 +1014,38 @@ afs_nfs3_smallfidder(struct nfs_fh3 *fhp, int status)
 {
     afs_int32 addr[2];
     struct vcache *vcp;
-    
+
 #if defined(AFS_SUN57_64BIT_ENV)
-    /* See also afs_fid() */    
+    /* See also afs_fid() */
     memcpy((char *)addr, fhp->fh3_data, 10);
     addr[1] = (addr[1] >> 48) & 0xffff;
-#else 
+#else
     memcpy((char *)addr, fhp->fh3_data, 2 * sizeof(long));
 #endif
-    
+
     AFS_GLOCK();
-    vcp = VTOAFS((struct vnode*)addr[0]);
-    
+    vcp = VTOAFS((struct vnode *)addr[0]);
+
     /* See also afs_osi_vget */
-    if (addr[1] == AFS_XLATOR_MAGIC)
-    {
+    if (addr[1] == AFS_XLATOR_MAGIC) {
 	if (status == NFS_OK) {
 	    struct SmallFid Sfid;
 	    struct cell *tcell;
-	    
-	    /* Make up and copy out a SmallFid */	
+
+	    /* Make up and copy out a SmallFid */
 	    tcell = afs_GetCell(vcp->fid.Cell, READ_LOCK);
 	    Sfid.Volume = vcp->fid.Fid.Volume;
-	    Sfid.CellAndUnique = ((tcell->cellIndex << 24) |
-				  (vcp->fid.Fid.Unique & 0xffffff));
+	    Sfid.CellAndUnique =
+		((tcell->cellIndex << 24) | (vcp->fid.Fid.Unique & 0xffffff));
 	    afs_PutCell(tcell, READ_LOCK);
-	    Sfid.Vnode = (u_short)(vcp->fid.Fid.Vnode & 0xffff);
+	    Sfid.Vnode = (u_short) (vcp->fid.Fid.Vnode & 0xffff);
 	    fhp->fh3_len = SIZEOF_SMALLFID;
-	    memcpy(fhp->fh3_data, (char*)&Sfid, fhp->fh3_len);
+	    memcpy(fhp->fh3_data, (char *)&Sfid, fhp->fh3_len);
 
 	    afs_Trace3(afs_iclSetp, CM_TRACE_NFS3OUT, ICL_TYPE_INT32, status,
 		       ICL_TYPE_POINTER, vcp, ICL_TYPE_FID, &Sfid);
 	}
-	
+
 	/* If we have a ref, release it */
 	if (vcp->vrefCount >= 1)
 	    AFS_RELE(AFSTOV(vcp));
@@ -948,340 +1053,493 @@ afs_nfs3_smallfidder(struct nfs_fh3 *fhp, int status)
     AFS_GUNLOCK();
 }
 
-void afs_nfs3_getattr(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_GETATTR, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_GETATTR].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_getattr(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_GETATTR, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_GETATTR].orig_proc) (args, xp, exp, rp,
+							  crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_setattr(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_SETATTR, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_SETATTR].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_setattr(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_SETATTR, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_SETATTR].orig_proc) (args, xp, exp, rp,
+							  crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_lookup(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_LOOKUP, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else { (*afs_rfs3_disp_tbl[NFSPROC3_LOOKUP].orig_proc)(args, xp, exp, rp, crp); 
-    if (afs_NFSRootOnly && call) { 
-	LOOKUP3res *resp = ( LOOKUP3res *)xp; 
-	afs_nfs3_smallfidder( &resp->resok.object , resp->status); } } 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_lookup(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_LOOKUP, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else {
+	(*afs_rfs3_disp_tbl[NFSPROC3_LOOKUP].orig_proc) (args, xp, exp, rp,
+							 crp);
+	if (afs_NFSRootOnly && call) {
+	    LOOKUP3res *resp = (LOOKUP3res *) xp;
+	    afs_nfs3_smallfidder(&resp->resok.object, resp->status);
+	}
+    }
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_access(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_ACCESS, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_ACCESS].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_access(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_ACCESS, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_ACCESS].orig_proc) (args, xp, exp, rp,
+							 crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_readlink(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_READLINK, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_READLINK].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_readlink(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_READLINK, (char *)args, &exp, rp,
+			    crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_READLINK].orig_proc) (args, xp, exp, rp,
+							   crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_read(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_READ, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_READ].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_read(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs3_dispatcher(0, NFSPROC3_READ, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_READ].orig_proc) (args, xp, exp, rp,
+						       crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_write(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_WRITE, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_WRITE].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_write(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_WRITE, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_WRITE].orig_proc) (args, xp, exp, rp,
+							crp);
+    curthread->t_cred = svcred;
+    return;
 }
-void afs_nfs3_create(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_CREATE, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else { (*afs_rfs3_disp_tbl[NFSPROC3_CREATE].orig_proc)(args, xp, exp, rp, crp); 
-    if (afs_NFSRootOnly && call) { 
-	CREATE3res *resp = ( CREATE3res *)xp; 
-	afs_nfs3_smallfidder( &resp->resok.obj.handle , resp->status); } } 
-    curthread->t_cred = svcred; 
-    return; 
+
+void
+afs_nfs3_create(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_CREATE, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else {
+	(*afs_rfs3_disp_tbl[NFSPROC3_CREATE].orig_proc) (args, xp, exp, rp,
+							 crp);
+	if (afs_NFSRootOnly && call) {
+	    CREATE3res *resp = (CREATE3res *) xp;
+	    afs_nfs3_smallfidder(&resp->resok.obj.handle, resp->status);
+	}
+    }
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_mkdir(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_MKDIR, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else { (*afs_rfs3_disp_tbl[NFSPROC3_MKDIR].orig_proc)(args, xp, exp, rp, crp); 
-    if (afs_NFSRootOnly && call) { 
-	MKDIR3res *resp = ( MKDIR3res *)xp; 
-	afs_nfs3_smallfidder( &resp->resok.obj.handle , resp->status); } } 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_mkdir(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_MKDIR, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else {
+	(*afs_rfs3_disp_tbl[NFSPROC3_MKDIR].orig_proc) (args, xp, exp, rp,
+							crp);
+	if (afs_NFSRootOnly && call) {
+	    MKDIR3res *resp = (MKDIR3res *) xp;
+	    afs_nfs3_smallfidder(&resp->resok.obj.handle, resp->status);
+	}
+    }
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_symlink(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_SYMLINK, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else { (*afs_rfs3_disp_tbl[NFSPROC3_SYMLINK].orig_proc)(args, xp, exp, rp, crp); 
-    if (afs_NFSRootOnly && call) {
-        SYMLINK3res *resp = ( SYMLINK3res *)xp;
-        afs_nfs3_smallfidder( &resp->resok.obj.handle , resp->status); } }
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_symlink(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_SYMLINK, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else {
+	(*afs_rfs3_disp_tbl[NFSPROC3_SYMLINK].orig_proc) (args, xp, exp, rp,
+							  crp);
+	if (afs_NFSRootOnly && call) {
+	    SYMLINK3res *resp = (SYMLINK3res *) xp;
+	    afs_nfs3_smallfidder(&resp->resok.obj.handle, resp->status);
+	}
+    }
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_mknod(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_MKNOD, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else { (*afs_rfs3_disp_tbl[NFSPROC3_MKNOD].orig_proc)(args, xp, exp, rp, crp); 
-    if (afs_NFSRootOnly && call) {
-        MKNOD3res *resp = ( MKNOD3res *)xp;
-        afs_nfs3_smallfidder( &resp->resok.obj.handle , resp->status); } }
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_mknod(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_MKNOD, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else {
+	(*afs_rfs3_disp_tbl[NFSPROC3_MKNOD].orig_proc) (args, xp, exp, rp,
+							crp);
+	if (afs_NFSRootOnly && call) {
+	    MKNOD3res *resp = (MKNOD3res *) xp;
+	    afs_nfs3_smallfidder(&resp->resok.obj.handle, resp->status);
+	}
+    }
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_remove(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_REMOVE, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_REMOVE].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_remove(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_REMOVE, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_REMOVE].orig_proc) (args, xp, exp, rp,
+							 crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_rmdir(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_RMDIR, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_RMDIR].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_rmdir(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_RMDIR, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_RMDIR].orig_proc) (args, xp, exp, rp,
+							crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_rename(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_RENAME, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_RENAME].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_rename(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_RENAME, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_RENAME].orig_proc) (args, xp, exp, rp,
+							 crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_link(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_LINK, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_LINK].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_link(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call = afs_nfs3_dispatcher(0, NFSPROC3_LINK, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_LINK].orig_proc) (args, xp, exp, rp,
+						       crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_readdir(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_READDIR, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_READDIR].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_readdir(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_READDIR, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_READDIR].orig_proc) (args, xp, exp, rp,
+							  crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_readdirplus(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_READDIRPLUS, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_READDIRPLUS].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_readdirplus(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_READDIRPLUS, (char *)args, &exp, rp,
+			    crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else if (call == 1)
+	afs_nfs3_notsupp((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_READDIRPLUS].orig_proc) (args, xp, exp,
+							      rp, crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_fsstat(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_FSSTAT, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_FSSTAT].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_fsstat(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_FSSTAT, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_FSSTAT].orig_proc) (args, xp, exp, rp,
+							 crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_fsinfo(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_FSINFO, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_FSINFO].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_fsinfo(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_FSINFO, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_FSINFO].orig_proc) (args, xp, exp, rp,
+							 crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_pathconf(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_PATHCONF, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_PATHCONF].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_pathconf(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_PATHCONF, (char *)args, &exp, rp,
+			    crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_PATHCONF].orig_proc) (args, xp, exp, rp,
+							   crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_nfs3_commit(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    afs_nfs3_resp dummy; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(0, NFSPROC3_COMMIT, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_rfs3_disp_tbl[NFSPROC3_COMMIT].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_nfs3_commit(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    afs_nfs3_resp dummy;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(0, NFSPROC3_COMMIT, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_rfs3_disp_tbl[NFSPROC3_COMMIT].orig_proc) (args, xp, exp, rp,
+							 crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
 struct afs_nfs_disp_tbl afs_rfs3_disp_tbl[22] = {
-    { afs_nfs2_null },
-    { afs_nfs3_getattr },
-    { afs_nfs3_setattr },
-    { afs_nfs3_lookup },
-    { afs_nfs3_access },
-    { afs_nfs3_readlink },
-    { afs_nfs3_read },
-    { afs_nfs3_write },
-    { afs_nfs3_create },
-    { afs_nfs3_mkdir },
-    { afs_nfs3_symlink },
-    { afs_nfs3_mknod },
-    { afs_nfs3_remove },
-    { afs_nfs3_rmdir },
-    { afs_nfs3_rename },
-    { afs_nfs3_link },
-    { afs_nfs3_readdir },
-    { afs_nfs3_readdirplus },
-    { afs_nfs3_fsstat },
-    { afs_nfs3_fsinfo },
-    { afs_nfs3_pathconf },
-    { afs_nfs3_commit }
+    {afs_nfs2_null},
+    {afs_nfs3_getattr},
+    {afs_nfs3_setattr},
+    {afs_nfs3_lookup},
+    {afs_nfs3_access},
+    {afs_nfs3_readlink},
+    {afs_nfs3_read},
+    {afs_nfs3_write},
+    {afs_nfs3_create},
+    {afs_nfs3_mkdir},
+    {afs_nfs3_symlink},
+    {afs_nfs3_mknod},
+    {afs_nfs3_remove},
+    {afs_nfs3_rmdir},
+    {afs_nfs3_rename},
+    {afs_nfs3_link},
+    {afs_nfs3_readdir},
+    {afs_nfs3_readdirplus},
+    {afs_nfs3_fsstat},
+    {afs_nfs3_fsinfo},
+    {afs_nfs3_pathconf},
+    {afs_nfs3_commit}
 };
 
-void afs_acl3_getacl(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(1, ACLPROC3_GETACL, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_acl3_disp_tbl[ACLPROC3_GETACL].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_acl3_getacl(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(1, ACLPROC3_GETACL, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_acl3_disp_tbl[ACLPROC3_GETACL].orig_proc) (args, xp, exp, rp,
+							 crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
-void afs_acl3_setacl(char *args, char *xp, char *exp, char *rp, char *crp) { 
-    u_int call; 
-    struct cred *svcred = curthread->t_cred; 
-    curthread->t_cred = (struct cred*)crp; 
-    call=afs_nfs3_dispatcher(1, ACLPROC3_SETACL, (char *)args, &exp, rp, crp); 
-    if (call>1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); 
-    else (*afs_acl3_disp_tbl[ACLPROC3_SETACL].orig_proc)(args, xp, exp, rp, crp); 
-    curthread->t_cred = svcred; 
-    return; 
+void
+afs_acl3_setacl(char *args, char *xp, char *exp, char *rp, char *crp)
+{
+    u_int call;
+    struct cred *svcred = curthread->t_cred;
+    curthread->t_cred = (struct cred *)crp;
+    call =
+	afs_nfs3_dispatcher(1, ACLPROC3_SETACL, (char *)args, &exp, rp, crp);
+    if (call > 1)
+	afs_nfs3_noaccess((struct afs_nfs3_resp *)xp);
+    else
+	(*afs_acl3_disp_tbl[ACLPROC3_SETACL].orig_proc) (args, xp, exp, rp,
+							 crp);
+    curthread->t_cred = svcred;
+    return;
 }
 
 struct afs_nfs_disp_tbl afs_acl3_disp_tbl[3] = {
-    { afs_nfs2_null },
-    { afs_acl3_getacl },
-    { afs_acl3_setacl },
+    {afs_nfs2_null},
+    {afs_acl3_getacl},
+    {afs_acl3_setacl},
 };
 
 /* Munge the dispatch tables to link us in first */
 void
 afs_xlatorinit_v3(struct rfs_disp_tbl *_rfs_tbl,
-                  struct rfs_disp_tbl *_acl_tbl)
+		  struct rfs_disp_tbl *_acl_tbl)
 {
     int i;
-    
-    if (xlatorinit_v3_done++) return;
-    
-    for (i=0; i < 22; i++) {
+
+    if (xlatorinit_v3_done++)
+	return;
+
+    for (i = 0; i < 22; i++) {
 	afs_rfs3_disp_tbl[i].orig_proc = _rfs_tbl[i].dis_proc;
 	_rfs_tbl[i].dis_proc = afs_rfs3_disp_tbl[i].afs_proc;
     }
-    
-    for (i=0; i < 3; i++) {
+
+    for (i = 0; i < 3; i++) {
 	afs_acl3_disp_tbl[i].orig_proc = _acl_tbl[i].dis_proc;
 	_acl_tbl[i].dis_proc = afs_acl3_disp_tbl[i].afs_proc;
     }