rename-conn-to-afs-conn-20090121

LICENSE IPL10
FIXES 124116

based on patch from daleg@elemental.org. rename to avoid conflict with opensolaris

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================
LICENSE IPL10
FIXES 124116

based on patch from daleg@elemental.org. rename to avoid conflict with opensolar
is

====================
LICENSE IPL10
FIXES 124116

based on patch from daleg@elemental.org. rename to avoid conflict with opensolar
is

diff --git a/src/afs/VNOPS/afs_vnop_create.c b/src/afs/VNOPS/afs_vnop_create.c
index 5602e0d..e0a8982 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_create.c
+++ b/src/afs/VNOPS/afs_vnop_create.c
@@ -45,7 +45,7 @@ afs_create(OSI_VC_DECL(adp), char *aname, struct vattr *attrs,
     afs_int32 origCBs, origZaps, finalZaps;
     struct vrequest treq;
     register afs_int32 code;
-    register struct conn *tc;
+    register struct afs_conn *tc;
     struct VenusFid newFid;
     struct AFSStoreStatus InStatus;
     struct AFSFetchStatus OutFidStatus, OutDirStatus;

diff --git a/src/afs/VNOPS/afs_vnop_dirops.c b/src/afs/VNOPS/afs_vnop_dirops.c
index 704c168..b3c97da 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_dirops.c
+++ b/src/afs/VNOPS/afs_vnop_dirops.c
@@ -41,7 +41,7 @@ afs_mkdir(OSI_VC_DECL(adp), char *aname, struct vattr *attrs,
 {
     struct vrequest treq;
     register afs_int32 code;
-    register struct conn *tc;
+    register struct afs_conn *tc;
     struct VenusFid newFid;
     register struct dcache *tdc;
     struct dcache *new_dc;
@@ -273,7 +273,7 @@ afs_rmdir(OSI_VC_DECL(adp), char *aname, struct AFS_UCRED *acred)
     register struct dcache *tdc;
     register struct vcache *tvc = NULL;
     register afs_int32 code;
-    register struct conn *tc;
+    register struct afs_conn *tc;
     afs_size_t offset, len;
     struct AFSFetchStatus OutDirStatus;
     struct AFSVolSync tsync;

diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c
index 7be73e7..051b1e5 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_flock.c
+++ b/src/afs/VNOPS/afs_vnop_flock.c
@@ -228,7 +228,7 @@ int
 HandleFlock(register struct vcache *avc, int acom, struct vrequest *areq,
            pid_t clid, int onlymine)
 {
-    struct conn *tc;
+    struct afs_conn *tc;
     struct SimpleLocks *slp, *tlp, **slpp;
     afs_int32 code;
     struct AFSVolSync tsync;
@@ -828,7 +828,7 @@ HandleGetLock(register struct vcache *avc, register struct AFS_FLOCK *af,
 static int
 GetFlockCount(struct vcache *avc, struct vrequest *areq)
 {
-    register struct conn *tc;
+    register struct afs_conn *tc;
     register afs_int32 code;
     struct AFSFetchStatus OutStatus;
     struct AFSCallBack CallBack;

diff --git a/src/afs/VNOPS/afs_vnop_link.c b/src/afs/VNOPS/afs_vnop_link.c
index 5a3a6c2..16d6588 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_link.c
+++ b/src/afs/VNOPS/afs_vnop_link.c
@@ -43,7 +43,7 @@ afs_link(struct vcache *avc, OSI_VC_DECL(adp), char *aname,
     struct vrequest treq;
     register struct dcache *tdc;
     register afs_int32 code;
-    register struct conn *tc;
+    register struct afs_conn *tc;
     afs_size_t offset, len;
     struct AFSFetchStatus OutFidStatus, OutDirStatus;
     struct AFSVolSync tsync;

diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c
index b786a5f..b7b30aa 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_lookup.c
+++ b/src/afs/VNOPS/afs_vnop_lookup.c
@@ -648,7 +648,7 @@ afs_DoBulkStat(struct vcache *adp, long dirCookie, struct vrequest *areqp)
     AFSCBFids fidParm;         /* file ID parm for bulk stat */
     AFSBulkStats statParm;     /* stat info parm for bulk stat */
     int fidIndex = 0;          /* which file were stating */
-    struct conn *tcp = 0;      /* conn for call */
+    struct afs_conn *tcp = 0;  /* conn for call */
     AFSCBs cbParm;             /* callback parm for bulk stat */
     struct server *hostp = 0;  /* host we got callback from */
     long startTime;            /* time we started the call,

diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c
index 33b4b5e..acb4e7e 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_remove.c
+++ b/src/afs/VNOPS/afs_vnop_remove.c
@@ -102,7 +102,7 @@ afsremove(register struct vcache *adp, register struct dcache *tdc,
          struct vrequest *treqp)
 {
     register afs_int32 code = 0;
-    register struct conn *tc;
+    register struct afs_conn *tc;
     struct AFSFetchStatus OutDirStatus;
     struct AFSVolSync tsync;
     XSTATS_DECLS;

diff --git a/src/afs/VNOPS/afs_vnop_rename.c b/src/afs/VNOPS/afs_vnop_rename.c
index 13ced95..1cccb92 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_rename.c
+++ b/src/afs/VNOPS/afs_vnop_rename.c
@@ -36,7 +36,7 @@ int
 afsrename(struct vcache *aodp, char *aname1, struct vcache *andp,
          char *aname2, struct AFS_UCRED *acred, struct vrequest *areq)
 {
-    register struct conn *tc;
+    register struct afs_conn *tc;
     register afs_int32 code = 0;
     afs_int32 returnCode;
     int oneDir, doLocally;

diff --git a/src/afs/VNOPS/afs_vnop_symlink.c b/src/afs/VNOPS/afs_vnop_symlink.c
index 7208655..a0b880b 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_symlink.c
+++ b/src/afs/VNOPS/afs_vnop_symlink.c
@@ -48,7 +48,7 @@ afs_symlink(OSI_VC_DECL(adp), char *aname, struct vattr *attrs,
     afs_uint32 now = 0;
     struct vrequest treq;
     afs_int32 code;
-    struct conn *tc;
+    struct afs_conn *tc;
     struct VenusFid newFid;
     struct dcache *tdc;
     afs_size_t offset, len;

diff --git a/src/afs/afs.h b/src/afs/afs.h
index 63d3bd2..9a078ed 100644 (file)
--- a/src/afs/afs.h
+++ b/src/afs/afs.h
@@ -327,9 +327,9 @@ struct unixuser {
     void *cellinfo;             /* pointer to cell info (PAG manager only) */
 };
 
-struct conn {
+struct afs_conn {
     /* Per-connection block. */
-    struct conn *next;         /* Next dude same server. */
+    struct afs_conn *next;             /* Next dude same server. */
     struct unixuser *user;     /* user validated with respect to. */
     struct rx_connection *id;  /* RPC connid. */
     struct srvAddr *srvr;      /* server associated with this conn */
@@ -361,7 +361,7 @@ struct srvAddr {
     struct srvAddr *next_bkt;  /* next item in hash bucket */
     struct srvAddr *next_sa;   /* another interface on same host */
     struct server *server;     /* back to parent */
-    struct conn *conns;                /* All user connections to this server */
+    struct afs_conn *conns;            /* All user connections to this server */
     afs_int32 sa_ip;           /* Host addr in network byte order */
     u_short sa_iprank;         /* indiv ip address priority */
     u_short sa_portal;         /* port addr in network byte order */

diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c
index 96f7a96..da1406a 100644 (file)
--- a/src/afs/afs_analyze.c
+++ b/src/afs/afs_analyze.c
@@ -93,7 +93,7 @@ static int
 VLDB_Same(struct VenusFid *afid, struct vrequest *areq)
 {
     struct vrequest treq;
-    struct conn *tconn;
+    struct afs_conn *tconn;
     int i, type = 0;
     union {
        struct vldbentry tve;
@@ -307,7 +307,7 @@ afs_BlackListOnce(struct vrequest *areq, struct VenusFid *afid,
  *     if this is a temporary or permanent error.
  *------------------------------------------------------------------------*/
 int
-afs_Analyze(register struct conn *aconn, afs_int32 acode,
+afs_Analyze(register struct afs_conn *aconn, afs_int32 acode,
            struct VenusFid *afid, register struct vrequest *areq, int op,
            afs_int32 locktype, struct cell *cellp)
 {

diff --git a/src/afs/afs_bypasscache.c b/src/afs/afs_bypasscache.c
index 1ec32a2..a0d1fd2 100644 (file)
--- a/src/afs/afs_bypasscache.c
+++ b/src/afs/afs_bypasscache.c
@@ -533,7 +533,7 @@ afs_PrefetchNoCache(register struct vcache *avc,
     struct vrequest *areq;
     afs_int32 code, length_hi, bytes, locked;    
        
-    register struct conn *tc;
+    register struct afs_conn *tc;
     afs_int32 i;
     struct rx_call *tcall;
     struct tlocal1 {

diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c
index 252e72c..0443488 100644 (file)
--- a/src/afs/afs_conn.c
+++ b/src/afs/afs_conn.c
@@ -63,13 +63,13 @@ unsigned int VNOSERVERS = 0;
  *
  * @return The conn struct, or NULL.
  */
-struct conn *
+struct afs_conn *
 afs_Conn(register struct VenusFid *afid, register struct vrequest *areq,
         afs_int32 locktype)
 {
     u_short fsport = AFS_FSPORT;
     struct volume *tv;
-    struct conn *tconn = NULL;
+    struct afs_conn *tconn = NULL;
     struct srvAddr *lowp = NULL;
     struct unixuser *tu;
     int notbusy;
@@ -157,12 +157,12 @@ afs_Conn(register struct VenusFid *afid, register struct vrequest *areq,
  *
  * @return The new connection.
  */
-struct conn *
+struct afs_conn *
 afs_ConnBySA(struct srvAddr *sap, unsigned short aport, afs_int32 acell,
             struct unixuser *tu, int force_if_down, afs_int32 create,
             afs_int32 locktype)
 {
-    struct conn *tc = 0;
+    struct afs_conn *tc = 0;
     struct rx_securityClass *csec;     /*Security class object */
     int isec;                  /*Security index */
     int service;
@@ -200,8 +200,8 @@ afs_ConnBySA(struct srvAddr *sap, unsigned short aport, afs_int32 acell,
         * gets set, marking the time of its ``birth''.
         */
        UpgradeSToWLock(&afs_xconn, 37);
-       tc = (struct conn *)afs_osi_Alloc(sizeof(struct conn));
-       memset((char *)tc, 0, sizeof(struct conn));
+       tc = (struct afs_conn *)afs_osi_Alloc(sizeof(struct afs_conn));
+       memset((char *)tc, 0, sizeof(struct afs_conn));
 
        tc->user = tu;
        tc->port = aport;
@@ -300,12 +300,12 @@ afs_ConnBySA(struct srvAddr *sap, unsigned short aport, afs_int32 acell,
  *
  * @return The established connection.
  */
-struct conn *
+struct afs_conn *
 afs_ConnByHost(struct server *aserver, unsigned short aport, afs_int32 acell,
               struct vrequest *areq, int aforce, afs_int32 locktype)
 {
     struct unixuser *tu;
-    struct conn *tc = 0;
+    struct afs_conn *tc = 0;
     struct srvAddr *sa = 0;
 
     AFS_STATCNT(afs_ConnByHost);
@@ -359,13 +359,13 @@ afs_ConnByHost(struct server *aserver, unsigned short aport, afs_int32 acell,
  *
  * @return The established connection or NULL.
  */
-struct conn *
+struct afs_conn *
 afs_ConnByMHosts(struct server *ahosts[], unsigned short aport,
                 afs_int32 acell, register struct vrequest *areq,
                 afs_int32 locktype)
 {
     register afs_int32 i;
-    register struct conn *tconn;
+    register struct afs_conn *tconn;
     register struct server *ts;
 
     /* try to find any connection from the set */
@@ -389,7 +389,7 @@ afs_ConnByMHosts(struct server *ahosts[], unsigned short aport,
  * @param locktype
  */
 void
-afs_PutConn(register struct conn *ac, afs_int32 locktype)
+afs_PutConn(register struct afs_conn *ac, afs_int32 locktype)
 {
     AFS_STATCNT(afs_PutConn);
     ac->refCount--;
@@ -406,7 +406,7 @@ afs_PutConn(register struct conn *ac, afs_int32 locktype)
 void
 ForceNewConnections(struct srvAddr *sap)
 {
-    struct conn *tc = 0;
+    struct afs_conn *tc = 0;
 
     if (!sap)
        return;                 /* defensive check */

diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c
index 52c3d30..26ad8f2 100644 (file)
--- a/src/afs/afs_dcache.c
+++ b/src/afs/afs_dcache.c
@@ -1862,7 +1862,7 @@ afs_GetDCache(register struct vcache *avc, afs_size_t abyte,
     struct tlocal1 *tsmall = 0;
     register struct dcache *tdc;
     register struct osi_file *file;
-    register struct conn *tc;
+    register struct afs_conn *tc;
     int downDCount = 0;
     struct server *newCallback = NULL;
     char setNewCallback;

diff --git a/src/afs/afs_disconnected.c b/src/afs/afs_disconnected.c
index e520cdc..149ecf8 100644 (file)
--- a/src/afs/afs_disconnected.c
+++ b/src/afs/afs_disconnected.c
@@ -479,7 +479,7 @@ int afs_ProcessOpRename(struct vcache *avc, struct vrequest *areq)
     char *old_name, *new_name;
     struct AFSFetchStatus OutOldDirStatus, OutNewDirStatus;
     struct AFSVolSync tsync;
-    struct conn *tc;
+    struct afs_conn *tc;
     afs_uint32 code = 0;
     XSTATS_DECLS;
 
@@ -590,7 +590,7 @@ int afs_ProcessOpCreate(struct vcache *avc,
     struct AFSVolSync tsync;
     struct vcache *tdp = NULL, *tvc = NULL;
     struct dcache *tdc = NULL;
-    struct conn *tc;
+    struct afs_conn *tc;
     afs_int32 now, hash, new_hash, index;
     int code = 0;
     XSTATS_DECLS;
@@ -859,7 +859,7 @@ int afs_ProcessOpRemove(struct vcache *avc, struct vrequest *areq)
     struct AFSFetchStatus OutDirStatus;
     struct VenusFid pdir_fid;
     struct AFSVolSync tsync;
-    struct conn *tc;
+    struct afs_conn *tc;
     struct vcache *tdp = NULL;
     int code = 0;
     XSTATS_DECLS;
@@ -977,7 +977,7 @@ end:
  */
 int afs_SendChanges(struct vcache *avc, struct vrequest *areq)
 {
-    struct conn *tc;
+    struct afs_conn *tc;
     struct AFSStoreStatus sstat;
     struct AFSFetchStatus fstat;
     struct AFSVolSync tsync;
@@ -1073,7 +1073,7 @@ int afs_SendChanges(struct vcache *avc, struct vrequest *areq)
  */
 int afs_ResyncDisconFiles(struct vrequest *areq, struct AFS_UCRED *acred)
 {
-    struct conn *tc;
+    struct afs_conn *tc;
     struct vcache *tvc, *tmp;
     struct AFSFetchStatus fstat;
     struct AFSCallBack callback;

diff --git a/src/afs/afs_init.c b/src/afs/afs_init.c
index 97cebb7..0ca6236 100644 (file)
--- a/src/afs/afs_init.c
+++ b/src/afs/afs_init.c
@@ -793,7 +793,7 @@ shutdown_AFS(void)
         */
        {
            struct server *ts, *nts;
-           struct conn *tc, *ntc;
+           struct afs_conn *tc, *ntc;
            register struct afs_cbr *tcbrp, *tbrp;
 
            for (i = 0; i < NSERVERS; i++) {
@@ -810,7 +810,7 @@ shutdown_AFS(void)
                                AFS_GUNLOCK();
                                rx_DestroyConnection(tc->id);
                                AFS_GLOCK();
-                               afs_osi_Free(tc, sizeof(struct conn));
+                               afs_osi_Free(tc, sizeof(struct afs_conn));
                                tc = ntc;
                            }
                        }

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 5e5a5c0..5497272 100644 (file)
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -1167,7 +1167,7 @@ int dummy_PSetAcl(char *ain, char *aout)
 DECL_PIOCTL(PSetAcl)
 {
     register afs_int32 code;
-    struct conn *tconn;
+    struct afs_conn *tconn;
     struct AFSOpaque acl;
     struct AFSVolSync tsync;
     struct AFSFetchStatus OutStatus;
@@ -1296,7 +1296,7 @@ DECL_PIOCTL(PGetAcl)
     struct AFSVolSync tsync;
     struct AFSFetchStatus OutStatus;
     afs_int32 code;
-    struct conn *tconn;
+    struct afs_conn *tconn;
     struct AFSFid Fid;
     XSTATS_DECLS;
 
@@ -1623,7 +1623,7 @@ DECL_PIOCTL(PGetVolumeStatus)
     char volName[32];
     char *offLineMsg = afs_osi_Alloc(256);
     char *motd = afs_osi_Alloc(256);
-    register struct conn *tc;
+    register struct afs_conn *tc;
     register afs_int32 code = 0;
     struct AFSFetchVolumeStatus volstat;
     register char *cp;
@@ -1693,7 +1693,7 @@ DECL_PIOCTL(PSetVolumeStatus)
     char volName[32];
     char *offLineMsg = afs_osi_Alloc(256);
     char *motd = afs_osi_Alloc(256);
-    register struct conn *tc;
+    register struct afs_conn *tc;
     register afs_int32 code = 0;
     struct AFSFetchVolumeStatus volstat;
     struct AFSStoreVolumeStatus storeStat;
@@ -2232,7 +2232,7 @@ DECL_PIOCTL(PCheckAuth)
 {
     int i;
     struct srvAddr *sa;
-    struct conn *tc;
+    struct afs_conn *tc;
     struct unixuser *tu;
     afs_int32 retValue;
 
@@ -2516,7 +2516,7 @@ DECL_PIOCTL(PGetCacheSize)
  */
 DECL_PIOCTL(PRemoveCallBack)
 {
-    register struct conn *tc;
+    register struct afs_conn *tc;
     register afs_int32 code = 0;
     struct AFSCallBack CallBacks_Array[1];
     struct AFSCBFids theFids;
@@ -2750,7 +2750,7 @@ DECL_PIOCTL(PRemoveMount)
     char *bufp;
     struct sysname_info sysState;
     afs_size_t offset, len;
-    register struct conn *tc;
+    register struct afs_conn *tc;
     register struct dcache *tdc;
     register struct vcache *tvc;
     struct AFSFetchStatus OutDirStatus;
@@ -4359,7 +4359,7 @@ DECL_PIOCTL(PPrefetchFromTape)
 {
     register afs_int32 code, code1;
     afs_int32 bytes;
-    struct conn *tc;
+    struct afs_conn *tc;
     struct rx_call *tcall;
     struct AFSVolSync tsync;
     struct AFSFetchStatus OutStatus;
@@ -4424,7 +4424,7 @@ DECL_PIOCTL(PPrefetchFromTape)
 DECL_PIOCTL(PResidencyCmd)
 {
     register afs_int32 code;
-    struct conn *tc;
+    struct afs_conn *tc;
     struct vcache *tvc;
     struct ResidencyCmdInputs *Inputs;
     struct ResidencyCmdOutputs *Outputs;
@@ -4557,7 +4557,7 @@ DECL_PIOCTL(PCallBackAddr)
     int srvAddrCount;
     struct server *ts;
     struct srvAddr *sa;
-    struct conn *tc;
+    struct afs_conn *tc;
     afs_int32 i, j;
     struct unixuser *tu;
     struct srvAddr **addrs;

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 6339eff..2b5d1d4 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -11,7 +11,7 @@
 #define _AFS_PROTOTYPES_H_
 
 /* afs_analyze.c */
-extern int afs_Analyze(register struct conn *aconn, afs_int32 acode,
+extern int afs_Analyze(register struct afs_conn *aconn, afs_int32 acode,
                       struct VenusFid *afid, register struct vrequest *areq,
                       int op, afs_int32 locktype, struct cell *cellp);
 
@@ -175,22 +175,22 @@ extern struct cell *afs_GetRealCellByIndex(register afs_int32 cellindex,
 extern afs_int32 cryptall;
 extern afs_rwlock_t afs_xinterface;
 extern afs_rwlock_t afs_xconn;
-extern struct conn *afs_Conn(register struct VenusFid *afid,
+extern struct afs_conn *afs_Conn(register struct VenusFid *afid,
                             register struct vrequest *areq,
                             afs_int32 locktype);
-extern struct conn *afs_ConnBySA(struct srvAddr *sap, unsigned short aport,
+extern struct afs_conn *afs_ConnBySA(struct srvAddr *sap, unsigned short aport,
                                 afs_int32 acell, struct unixuser *tu,
                                 int force_if_down, afs_int32 create,
                                 afs_int32 locktype);
-extern struct conn *afs_ConnByMHosts(struct server *ahosts[],
+extern struct afs_conn *afs_ConnByMHosts(struct server *ahosts[],
                                     unsigned short aport, afs_int32 acell,
                                     register struct vrequest *areq,
                                     afs_int32 locktype);
-extern struct conn *afs_ConnByHost(struct server *aserver,
+extern struct afs_conn *afs_ConnByHost(struct server *aserver,
                                   unsigned short aport, afs_int32 acell,
                                   struct vrequest *areq, int aforce,
                                   afs_int32 locktype);
-extern void afs_PutConn(register struct conn *ac, afs_int32 locktype);
+extern void afs_PutConn(register struct afs_conn *ac, afs_int32 locktype);
 extern void ForceNewConnections(struct srvAddr *sap);
 
 

diff --git a/src/afs/afs_segments.c b/src/afs/afs_segments.c
index 97674c3..aa5fc8b 100644 (file)
--- a/src/afs/afs_segments.c
+++ b/src/afs/afs_segments.c
@@ -40,7 +40,7 @@ afs_uint32 afs_stampValue = 0;
 int
 afs_StoreMini(register struct vcache *avc, struct vrequest *areq)
 {
-    register struct conn *tc;
+    register struct afs_conn *tc;
     struct AFSStoreStatus InStatus;
     struct AFSFetchStatus OutStatus;
     struct AFSVolSync tsync;
@@ -311,7 +311,7 @@ afs_StoreAllSegments(register struct vcache *avc, struct vrequest *areq,
            int nomore;
            unsigned int first = 0;
            int *shouldwake;
-           struct conn *tc;
+           struct afs_conn *tc;
            struct osi_file *tfile;
            struct rx_call *tcall;
            XSTATS_DECLS;

diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c
index 33cae8e..b2ed3ef 100644 (file)
--- a/src/afs/afs_server.c
+++ b/src/afs/afs_server.c
@@ -288,7 +288,7 @@ static void
 CheckVLServer(register struct srvAddr *sa, struct vrequest *areq)
 {
     register struct server *aserver = sa->server;
-    register struct conn *tc;
+    register struct afs_conn *tc;
     register afs_int32 code;
 
     AFS_STATCNT(CheckVLServer);
@@ -531,7 +531,7 @@ afs_CheckServers(int adown, struct cell *acellp)
     struct vrequest treq;
     struct server *ts;
     struct srvAddr *sa;
-    struct conn *tc;
+    struct afs_conn *tc;
     afs_int32 i, j;
     afs_int32 code;
     afs_int32 start, end = 0, delta;
@@ -540,7 +540,7 @@ afs_CheckServers(int adown, struct cell *acellp)
     char tbuffer[CVBS];
     int srvAddrCount;
     struct srvAddr **addrs;
-    struct conn **conns;
+    struct afs_conn **conns;
     int nconns;
     struct rx_connection **rxconns;      
     afs_int32 *conntimer, *deltas, *results;
@@ -554,7 +554,7 @@ afs_CheckServers(int adown, struct cell *acellp)
     if (AFS_IS_DISCONNECTED)
         return;
 
-    conns = (struct conn **)0;
+    conns = (struct afs_conn **)0;
     rxconns = (struct rx_connection **) 0;
     conntimer = 0;
     nconns = 0;
@@ -584,7 +584,7 @@ afs_CheckServers(int adown, struct cell *acellp)
     ReleaseReadLock(&afs_xsrvAddr);
     ReleaseReadLock(&afs_xserver);
 
-    conns = (struct conn **)afs_osi_Alloc(j * sizeof(struct conn *));
+    conns = (struct afs_conn **)afs_osi_Alloc(j * sizeof(struct afs_conn *));
     rxconns = (struct rx_connection **)afs_osi_Alloc(j * sizeof(struct rx_connection *));
     conntimer = (afs_int32 *)afs_osi_Alloc(j * sizeof (afs_int32));
     deltas = (afs_int32 *)afs_osi_Alloc(j * sizeof (afs_int32));
@@ -752,7 +752,7 @@ afs_CheckServers(int adown, struct cell *acellp)
     }
     
     afs_osi_Free(addrs, srvAddrCount * sizeof(*addrs));
-    afs_osi_Free(conns, j * sizeof(struct conn *));
+    afs_osi_Free(conns, j * sizeof(struct afs_conn *));
     afs_osi_Free(rxconns, j * sizeof(struct rx_connection *));
     afs_osi_Free(conntimer, j * sizeof(afs_int32));
     afs_osi_Free(deltas, j * sizeof(afs_int32));
@@ -1859,7 +1859,7 @@ void afs_RemoveAllConns()
     int i;
     struct server *ts, *nts;
     struct srvAddr *sa;
-    struct conn *tc, *ntc;
+    struct afs_conn *tc, *ntc;
 
     ObtainReadLock(&afs_xserver);
     ObtainWriteLock(&afs_xconn, 1001);
@@ -1876,7 +1876,7 @@ void afs_RemoveAllConns()
                         AFS_GUNLOCK();
                         rx_DestroyConnection(tc->id);
                         AFS_GLOCK();
-                        afs_osi_Free(tc, sizeof(struct conn));
+                        afs_osi_Free(tc, sizeof(struct afs_conn));
                         tc = ntc;
                     }
                     sa->conns = NULL;

diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c
index 31de6f0..2d6a53f 100644 (file)
--- a/src/afs/afs_user.c
+++ b/src/afs/afs_user.c
@@ -65,7 +65,7 @@ RemoveUserConns(register struct unixuser *au)
     register int i;
     register struct server *ts;
     register struct srvAddr *sa;
-    register struct conn *tc, **lc;
+    register struct afs_conn *tc, **lc;
 
     AFS_STATCNT(RemoveUserConns);
     for (i = 0; i < NSERVERS; i++) {
@@ -78,7 +78,7 @@ RemoveUserConns(register struct unixuser *au)
                        AFS_GUNLOCK();
                        rx_DestroyConnection(tc->id);
                        AFS_GLOCK();
-                       afs_osi_Free(tc, sizeof(struct conn));
+                       afs_osi_Free(tc, sizeof(struct afs_conn));
                        break;  /* at most one instance per server */
                    }           /*Found unreferenced connection for user */
                }               /*For each connection on the server */
@@ -243,7 +243,7 @@ afs_ResetUserConns(register struct unixuser *auser)
 {
     int i;
     struct srvAddr *sa;
-    struct conn *tc;
+    struct afs_conn *tc;
 
     AFS_STATCNT(afs_ResetUserConns);
     ObtainReadLock(&afs_xsrvAddr);

diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c
index 602b822..82f8028 100644 (file)
--- a/src/afs/afs_util.c
+++ b/src/afs/afs_util.c
@@ -244,7 +244,7 @@ afs_CheckLocks(void)
     {
        struct srvAddr *sa;
        struct server *ts;
-       struct conn *tc;
+       struct afs_conn *tc;
        for (i = 0; i < NSERVERS; i++) {
            for (ts = afs_servers[i]; ts; ts = ts->next) {
                if (ts->flags & SRVR_ISDOWN)

diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c
index e298083..d3db0ae 100644 (file)
--- a/src/afs/afs_vcache.c
+++ b/src/afs/afs_vcache.c
@@ -388,7 +388,7 @@ afs_FlushVCBs(afs_int32 lockit)
     struct server *tsp;
     int i;
     struct vrequest treq;
-    struct conn *tc;
+    struct afs_conn *tc;
     int safety1, safety2, safety3;
     XSTATS_DECLS;
     if ((code = afs_InitReq(&treq, afs_osi_credp)))
@@ -1172,7 +1172,7 @@ afs_FlushActiveVcaches(register afs_int32 doflocks)
 {
     register struct vcache *tvc;
     register int i;
-    register struct conn *tc;
+    register struct afs_conn *tc;
     register afs_int32 code;
     register struct AFS_UCRED *cred = NULL;
     struct vrequest treq, ureq;
@@ -1502,7 +1502,7 @@ afs_WriteVCache(register struct vcache *avc,
                struct vrequest *areq)
 {
     afs_int32 code;
-    struct conn *tc;
+    struct afs_conn *tc;
     struct AFSFetchStatus OutStatus;
     struct AFSVolSync tsync;
     XSTATS_DECLS;
@@ -1760,7 +1760,7 @@ afs_RemoteLookup(register struct VenusFid *afid, struct vrequest *areq,
 {
     afs_int32 code;
     afs_uint32 start;
-    register struct conn *tc;
+    register struct afs_conn *tc;
     struct AFSFetchStatus OutDirStatus;
     XSTATS_DECLS;
     if (!name)
@@ -2561,7 +2561,7 @@ afs_FetchStatus(struct vcache * avc, struct VenusFid * afid,
 {
     int code;
     afs_uint32 start = 0;
-    register struct conn *tc;
+    register struct afs_conn *tc;
     struct AFSCallBack CallBack;
     struct AFSVolSync tsync;
     XSTATS_DECLS;
@@ -2626,7 +2626,7 @@ afs_FetchStatus(struct vcache * avc, struct VenusFid * afid,
 void
 afs_StuffVcache(register struct VenusFid *afid,
                struct AFSFetchStatus *OutStatus,
-               struct AFSCallBack *CallBack, register struct conn *tc,
+               struct AFSCallBack *CallBack, register struct afs_conn *tc,
                struct vrequest *areq)
 {
     register afs_int32 code, i, newvcache = 0;

diff --git a/src/afs/afs_volume.c b/src/afs/afs_volume.c
index de5c48f..6760a70 100644 (file)
--- a/src/afs/afs_volume.c
+++ b/src/afs/afs_volume.c
@@ -708,7 +708,7 @@ afs_NewVolumeByName(char *aname, afs_int32 acell, int agood,
     struct uvldbentry *utve;
     struct cell *tcell;
     char *tbuffer, *ve;
-    struct conn *tconn;
+    struct afs_conn *tconn;
     struct vrequest treq;
 
     if (strlen(aname) > VL_MAXNAMELEN) /* Invalid volume name */
@@ -1009,7 +1009,7 @@ InstallUVolumeEntry(struct volume *av, struct uvldbentry *ve, int acell,
                    struct cell *tcell, struct vrequest *areq)
 {
     register struct server *ts;
-    struct conn *tconn;
+    struct afs_conn *tconn;
     struct cell *cellp;
     register int i, j;
     afs_uint32 serverid;

diff --git a/src/afsweb/apache_includes/1.2/httpd.h b/src/afsweb/apache_includes/1.2/httpd.h
index 7481bc7..51cdc3f 100644 (file)
--- a/src/afsweb/apache_includes/1.2/httpd.h
+++ b/src/afsweb/apache_includes/1.2/httpd.h
@@ -429,7 +429,7 @@ struct htaccess_result {
 };
 
 
-typedef struct conn_rec conn_rec;
+typedef struct afs_conn_rec conn_rec;
 typedef struct server_rec server_rec;
 typedef struct request_rec request_rec;
 typedef struct listen_rec listen_rec;
@@ -553,7 +553,7 @@ struct request_rec {
 /* Things which are per connection
  */
 
-struct conn_rec {
+struct afs_conn_rec {
 
     pool *pool;
     server_rec *server;

diff --git a/src/afsweb/apache_includes/1.3.1/httpd.h b/src/afsweb/apache_includes/1.3.1/httpd.h
index ed87ca7..14bf94a 100644 (file)
--- a/src/afsweb/apache_includes/1.3.1/httpd.h
+++ b/src/afsweb/apache_includes/1.3.1/httpd.h
@@ -565,7 +565,7 @@ extern "C" {
        const struct htaccess_result *next;
     };
 
-    typedef struct conn_rec conn_rec;
+    typedef struct afs_conn_rec conn_rec;
     typedef struct server_rec server_rec;
     typedef struct request_rec request_rec;
     typedef struct listen_rec listen_rec;
@@ -718,7 +718,7 @@ extern "C" {
 /* Things which are per connection
  */
 
-    struct conn_rec {
+    struct afs_conn_rec {
 
        ap_pool *pool;
        server_rec *server;

diff --git a/src/afsweb/apache_includes/1.3.6/httpd.h b/src/afsweb/apache_includes/1.3.6/httpd.h
index b925805..ba86ea2 100644 (file)
--- a/src/afsweb/apache_includes/1.3.6/httpd.h
+++ b/src/afsweb/apache_includes/1.3.6/httpd.h
@@ -622,7 +622,7 @@ extern "C" {
        const struct htaccess_result *next;
     };
 
-    typedef struct conn_rec conn_rec;
+    typedef struct afs_conn_rec conn_rec;
     typedef struct server_rec server_rec;
     typedef struct request_rec request_rec;
     typedef struct listen_rec listen_rec;
@@ -784,7 +784,7 @@ extern "C" {
 /* Things which are per connection
  */
 
-    struct conn_rec {
+    struct afs_conn_rec {
 
        ap_pool *pool;
        server_rec *server;

diff --git a/src/venus/kdump.c b/src/venus/kdump.c
index 4c7b4c1..5701e8c 100644 (file)
--- a/src/venus/kdump.c
+++ b/src/venus/kdump.c
@@ -2005,10 +2005,10 @@ print_allocs(pnt)
     T += j;
     printf("%20s:\t%8d bytes\t[%d servers/%d bytes each]\n", "Server package",
           j, i, sizeof(struct server));
-    j = (Nconns * sizeof(struct conn));
+    j = (Nconns * sizeof(struct afs_conn));
     T += j;
     printf("%20s:\t%8d bytes\t[%d conns/%d bytes each]\n",
-          "Connection package", j, Nconns, sizeof(struct conn));
+          "Connection package", j, Nconns, sizeof(struct afs_conn));
 
     i = (AFS_NCBRS * sizeof(struct afs_cbr)) * (j =
                                                afs_cmperfstats.
@@ -2669,12 +2669,12 @@ void
 print_conns(kmem, srv, conns, Con, pnt)
      int kmem, Con, pnt;
      struct srvAddr *srv;
-     struct conn *conns;
+     struct afs_conn *conns;
 {
-    struct conn *cep, ce, *centry = &ce;
+    struct afs_conn *cep, ce, *centry = &ce;
     int i = 1;
 
-    cep = (struct conn *)conns;
+    cep = (struct afs_conn *)conns;
     if (pnt && Con != 2) {
        if (cep)
            printf("\tRPC connections for server %lx:\n", srv);
@@ -2693,7 +2693,7 @@ print_conns(kmem, srv, conns, Con, pnt)
 void
 print_conn(kmem, conns, ptr, pnt)
      int kmem, pnt;
-     struct conn *conns, *ptr;
+     struct afs_conn *conns, *ptr;
 {
     if (!pnt)
        return;