STABLE14-rename-conn-to-afs-conn-20090121

LICENSE IPL10
FIXES 124116

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

(cherry picked from commit a268678326f3713a0ba41f69a1432bd1fca2872f)

diff --git a/src/afs/VNOPS/afs_vnop_create.c b/src/afs/VNOPS/afs_vnop_create.c
index adda6f4482976231d574b02c639f9baa42dbccd0..1684307ca863a1aa939689036762b960d78fd04a 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 5e73dd0d643d18ba2df65f0afa224ee5eb7917d0..ed6cebe9a0c7072ec27af75a6d4592f4aeae73a3 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;
     afs_size_t offset, len;
@@ -176,7 +176,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 5e4b0e6191865d64d89aaca867c1f8514ddfe1a9..3b8e8cf69447b50309c44f215a370dcc2d083685 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_flock.c
+++ b/src/afs/VNOPS/afs_vnop_flock.c
@@ -225,7 +225,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;
@@ -809,7 +809,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 04c08a6dc4be3ea1aed5b9f1467b7ca3e1859afe..830f60e5ab06d4d269817a811c01ff09d3902520 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_link.c
+++ b/src/afs/VNOPS/afs_vnop_link.c
@@ -45,7 +45,7 @@ afs_link(avc, OSI_VC_ARG(adp), aname, acred)
     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 76aa6fa25e554f097c9ea495208b68398353d760..27f12caa6dceb72d8118f215beb8a8e5cecbb14e 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_lookup.c
+++ b/src/afs/VNOPS/afs_vnop_lookup.c
@@ -549,7 +549,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 8660c978a01fc759a1ff1228e5c081bb82f911d9..41bf97ef0d222010a4d2d8f638948c44e3759b90 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_remove.c
+++ b/src/afs/VNOPS/afs_vnop_remove.c
@@ -105,7 +105,7 @@ afsremove(register struct vcache *adp, register struct dcache *tdc,
          struct vrequest *treqp)
 {
     register afs_int32 code;
-    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 02c67f99c06cefe3515713cddce14eb33883132d..d5c12fdaf8646c6d1f073f27b7a9775c12896c05 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;
     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 57077e58ea813a45da283194292d6837dedff648..49325cf961db78ff7021c6f66efdc5b2d3cae274 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_symlink.c
+++ b/src/afs/VNOPS/afs_vnop_symlink.c
@@ -52,7 +52,7 @@ int afs_symlink
     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 0314e809e0bd6ab08e4de7c135dfdefae94c4833..2224e5a18d67cd87025347bfdc734480ff0a7db0 100644 (file)
--- a/src/afs/afs.h
+++ b/src/afs/afs.h
@@ -320,9 +320,9 @@ struct unixuser {
     struct afs_exporter *exporter;     /* more info about the exporter for the remote user */
 };
 
-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 */
@@ -354,7 +354,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 1bf3d1dc7a8fd6697512aac90fc26311f7ae4daf..7b1869caecb4689a698b2436ef38a1f1114ee48a 100644 (file)
--- a/src/afs/afs_analyze.c
+++ b/src/afs/afs_analyze.c
@@ -323,7 +323,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;
@@ -537,7 +537,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_conn.c b/src/afs/afs_conn.c
index bae3f01354ca347d4b23ab0126df5e8c72684b87..b91e0d7c67497e0f8cf9aa7fab17afb44acbdde1 100644 (file)
--- a/src/afs/afs_conn.c
+++ b/src/afs/afs_conn.c
@@ -52,13 +52,13 @@ afs_int32 cryptall = 0;             /* encrypt all communications */
 
 
 unsigned int VNOSERVERS = 0;
-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;
@@ -132,12 +132,12 @@ afs_Conn(register struct VenusFid *afid, register struct vrequest *areq,
 }                              /*afs_Conn */
 
 
-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;
@@ -167,8 +167,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;
@@ -260,12 +260,12 @@ afs_ConnBySA(struct srvAddr *sap, unsigned short aport, afs_int32 acell,
  * Having force... true and UTokensBad true simultaneously means that the tokens
  * went bad and we're supposed to create a new, unauthenticated, 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);
@@ -301,13 +301,13 @@ afs_ConnByHost(struct server *aserver, unsigned short aport, afs_int32 acell,
 }                              /*afs_ConnByHost */
 
 
-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 */
@@ -326,7 +326,7 @@ afs_ConnByMHosts(struct server *ahosts[], unsigned short aport,
 
 
 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--;
@@ -340,7 +340,7 @@ connections in this case
 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 f6ab0d6be40c71aad7ad29e33f66e972fd3eb872..4ec3a33ca55b5c2b8797545dc2cb2326112ada62 100644 (file)
--- a/src/afs/afs_dcache.c
+++ b/src/afs/afs_dcache.c
@@ -1514,7 +1514,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_init.c b/src/afs/afs_init.c
index 45638d4e45205018a40342ae4af7547baf13d0b7..b9f24e233ec62cd9efa67acaf7153d634a16392c 100644 (file)
--- a/src/afs/afs_init.c
+++ b/src/afs/afs_init.c
@@ -767,7 +767,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++) {
@@ -784,7 +784,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 01307361a0953921fd545ba4437a91a826c6c673..ab4847129492054076786c52c43a363440ee0afa 100644 (file)
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -1215,7 +1215,7 @@ DECL_PIOCTL(PGetFID)
 DECL_PIOCTL(PSetAcl)
 {
     register afs_int32 code;
-    struct conn *tconn;
+    struct afs_conn *tconn;
     struct AFSOpaque acl;
     struct AFSVolSync tsync;
     struct AFSFetchStatus OutStatus;
@@ -1303,7 +1303,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;
 
@@ -1546,7 +1546,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;
@@ -1601,7 +1601,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;
@@ -2040,7 +2040,7 @@ DECL_PIOCTL(PCheckAuth)
 {
     int i;
     struct srvAddr *sa;
-    struct conn *tc;
+    struct afs_conn *tc;
     struct unixuser *tu;
     afs_int32 retValue;
 
@@ -2206,7 +2206,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;
@@ -2399,7 +2399,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;
@@ -3723,7 +3723,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;
@@ -3788,7 +3788,7 @@ DECL_PIOCTL(PPrefetchFromTape)
 DECL_PIOCTL(PFsCmd)
 {
     register afs_int32 code;
-    struct conn *tc;
+    struct afs_conn *tc;
     struct vcache *tvc;
     struct FsCmdInputs *Inputs;
     struct FsCmdOutputs *Outputs;
@@ -3903,7 +3903,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 9562da7b071a67b15d0823e53f55b2511e76dde4..7ba69225cb603d0853b39cdf82e6fa270114a149 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -13,7 +13,7 @@
 /* afs_analyze.c */
 extern void init_et_to_sys_error(void);
 extern void afs_FinalizeReq(struct vrequest *areq);
-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);
 extern int afs_CheckCode(afs_int32 acode, struct vrequest *areq, int where);
@@ -245,22 +245,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 6f2ce5b861571e849aa2f5959e9a168b55673360..1ff2135f60cad9a9f4bff91a685c13a19da82855 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;
@@ -305,7 +305,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 f277d55405c5c8a085e5535c6c348f4320cefad9..4b63afbf1b991e94315b187d987cf9bb76828924 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,14 +540,14 @@ 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;
 
     AFS_STATCNT(afs_CheckServers);
 
-    conns = (struct conn **)0;
+    conns = (struct afs_conn **)0;
     rxconns = (struct rx_connection **) 0;
     conntimer = 0;
     nconns = 0;
@@ -577,7 +577,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));
@@ -745,7 +745,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));

diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c
index 24b252474360c6a7a4df2b8ee97e630501361c70..fb0f292b651bf33372e0ee145a129e36d7418bb6 100644 (file)
--- a/src/afs/afs_user.c
+++ b/src/afs/afs_user.c
@@ -64,7 +64,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++) {
@@ -77,7 +77,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 */
@@ -232,7 +232,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 f0d34922a794b5848745db6c1b509f9cbaf19a36..85a1a8b2e3d37fe5a9b9d5bac64982f7d17d537e 100644 (file)
--- a/src/afs/afs_util.c
+++ b/src/afs/afs_util.c
@@ -302,7 +302,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 fe095ffc570a2c33d007df4e5c45bf1d7fcc44ec..3782a41e86f014fa54e6b93d50bc1b59d9b8e558 100644 (file)
--- a/src/afs/afs_vcache.c
+++ b/src/afs/afs_vcache.c
@@ -396,7 +396,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)))
@@ -1226,7 +1226,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;
@@ -1553,7 +1553,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;
@@ -1712,7 +1712,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)
@@ -2412,7 +2412,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;
     struct volume *volp;
@@ -2509,7 +2509,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 e5259f7d9ab19d4f007e4b77a5cf5837bc5fe88d..30fa912ce0f084a80bbdd4d113669dd279e3f647 100644 (file)
--- a/src/afs/afs_volume.c
+++ b/src/afs/afs_volume.c
@@ -615,7 +615,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 */
@@ -911,7 +911,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 7481bc7ba09beb9895d5b7c764fd42aecbf6d3a1..51cdc3fb0a3fdbb825de3fed4fb97a9fb8c24b82 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 ed87ca790dbcf93d573dc74db74aaad8dda44aa4..14bf94a793cf8cd1417b5771e4eb6a233a9b1c1b 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 b92580537e0071232c718ef5037ecb1550169131..ba86ea290544f7976b0fc3161d69774e8d84afa2 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 4c7b4c198c9f86a1cb1b363b93e8e8a264a3e656..5701e8c5e234b98619490364def53f4e305734b8 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;