See attached. This patch renames struct conn in src/afs/afs.h to
afs_conn and also adds a typedef for it called afs_conn_t
Put it in the openafs src root and 'gpatch -p1 < openafs-conn-patch.txt'
/dale
--- openafs-1.4.8/src/afs/afs_analyze.c Mon Oct 27 16:54:06 2008
+++ openafs-1.4.8-os/src/afs/afs_analyze.c Sun Jan 11 18:31:57 2009
@@ -323,7 +323,7 @@
VLDB_Same(struct VenusFid *afid, struct vrequest *areq)
{
struct vrequest treq;
- struct conn *tconn;
+ afs_conn_t *tconn;
int i, type = 0;
union {
struct vldbentry tve;
@@ -537,7 +537,7 @@
* if this is a temporary or permanent error.
*------------------------------------------------------------------------*/
int
-afs_Analyze(register struct conn *aconn, afs_int32 acode,
+afs_Analyze(register afs_conn_t *aconn, afs_int32 acode,
struct VenusFid *afid, register struct vrequest *areq, int op,
afs_int32 locktype, struct cell *cellp)
{
--- openafs-1.4.8/src/afs/afs_conn.c Mon Oct 20 09:41:00 2008
+++ openafs-1.4.8-os/src/afs/afs_conn.c Sun Jan 11 18:37:24 2009
@@ -52,13 +52,13 @@
unsigned int VNOSERVERS = 0;
-struct conn *
+afs_conn_t *
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;
+ afs_conn_t *tconn = NULL;
struct srvAddr *lowp = NULL;
struct unixuser *tu;
int notbusy;
@@ -132,12 +132,12 @@
} /*afs_Conn */
-struct conn *
+afs_conn_t *
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;
+ afs_conn_t *tc = 0;
struct rx_securityClass *csec; /*Security class object */
int isec; /*Security index */
int service;
@@ -167,8 +167,8 @@
* 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 = (afs_conn_t *)afs_osi_Alloc(sizeof(afs_conn_t));
+ memset((char *)tc, 0, sizeof(afs_conn_t));
tc->user = tu;
tc->port = aport;
@@ -260,12 +260,12 @@
* 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 *
+afs_conn_t *
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;
+ afs_conn_t *tc = 0;
struct srvAddr *sa = 0;
AFS_STATCNT(afs_ConnByHost);
@@ -301,13 +301,13 @@
} /*afs_ConnByHost */
-struct conn *
+afs_conn_t *
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 afs_conn_t *tconn;
register struct server *ts;
/* try to find any connection from the set */
@@ -326,7 +326,7 @@
void
-afs_PutConn(register struct conn *ac, afs_int32 locktype)
+afs_PutConn(register afs_conn_t *ac, afs_int32 locktype)
{
AFS_STATCNT(afs_PutConn);
ac->refCount--;
@@ -340,7 +340,7 @@
void
ForceNewConnections(struct srvAddr *sap)
{
- struct conn *tc = 0;
+ afs_conn_t *tc = 0;
if (!sap)
return; /* defensive check */
--- openafs-1.4.8/src/afs/afs_dcache.c Tue Aug 26 07:02:10 2008
+++ openafs-1.4.8-os/src/afs/afs_dcache.c Sun Jan 11 18:38:03 2009
@@ -1514,7 +1514,7 @@
struct tlocal1 *tsmall = 0;
register struct dcache *tdc;
register struct osi_file *file;
- register struct conn *tc;
+ register afs_conn_t *tc;
int downDCount = 0;
struct server *newCallback = NULL;
char setNewCallback;
--- openafs-1.4.8/src/afs/afs.h Mon Oct 20 09:41:00 2008
+++ openafs-1.4.8-os/src/afs/afs.h Sun Jan 11 19:13:45 2009
@@ -291,9 +291,9 @@
struct afs_exporter *exporter; /* more info about the exporter for the
remote user */
};
-struct conn {
+typedef 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 */
@@ -300,7 +300,7 @@
short refCount; /* reference count for allocation */
unsigned short port; /* port associated with this connection */
char forceConnectFS; /* Should we try again with these tokens? */
-};
+} afs_conn_t;
#define SQNULL -1
--- openafs-1.4.8/src/afs/afs_init.c Thu Jun 12 10:25:03 2008
+++ openafs-1.4.8-os/src/afs/afs_init.c Sun Jan 11 18:39:11 2009
@@ -757,7 +757,7 @@
*/
{
struct server *ts, *nts;
- struct conn *tc, *ntc;
+ afs_conn_t *tc, *ntc;
register struct afs_cbr *tcbrp, *tbrp;
for (i = 0; i < NSERVERS; i++) {
@@ -774,7 +774,7 @@
AFS_GUNLOCK();
rx_DestroyConnection(tc->id);
AFS_GLOCK();
- afs_osi_Free(tc, sizeof(struct conn));
+ afs_osi_Free(tc, sizeof(afs_conn_t));
tc = ntc;
}
}
--- openafs-1.4.8/src/afs/afs_pioctl.c Fri Apr 18 13:13:32 2008
+++ openafs-1.4.8-os/src/afs/afs_pioctl.c Sun Jan 11 18:46:02 2009
@@ -1211,7 +1211,7 @@
DECL_PIOCTL(PSetAcl)
{
register afs_int32 code;
- struct conn *tconn;
+ afs_conn_t *tconn;
struct AFSOpaque acl;
struct AFSVolSync tsync;
struct AFSFetchStatus OutStatus;
@@ -1299,7 +1299,7 @@
struct AFSVolSync tsync;
struct AFSFetchStatus OutStatus;
afs_int32 code;
- struct conn *tconn;
+ afs_conn_t *tconn;
struct AFSFid Fid;
XSTATS_DECLS;
@@ -1542,7 +1542,7 @@
char volName[32];
char *offLineMsg = afs_osi_Alloc(256);
char *motd = afs_osi_Alloc(256);
- register struct conn *tc;
+ register afs_conn_t *tc;
register afs_int32 code = 0;
struct AFSFetchVolumeStatus volstat;
register char *cp;
@@ -1597,7 +1597,7 @@
char volName[32];
char *offLineMsg = afs_osi_Alloc(256);
char *motd = afs_osi_Alloc(256);
- register struct conn *tc;
+ register afs_conn_t *tc;
register afs_int32 code = 0;
struct AFSFetchVolumeStatus volstat;
struct AFSStoreVolumeStatus storeStat;
@@ -2036,7 +2036,7 @@
{
int i;
struct srvAddr *sa;
- struct conn *tc;
+ afs_conn_t *tc;
struct unixuser *tu;
afs_int32 retValue;
@@ -2202,7 +2202,7 @@
DECL_PIOCTL(PRemoveCallBack)
{
- register struct conn *tc;
+ register afs_conn_t *tc;
register afs_int32 code = 0;
struct AFSCallBack CallBacks_Array[1];
struct AFSCBFids theFids;
@@ -2395,7 +2395,7 @@
char *bufp;
struct sysname_info sysState;
afs_size_t offset, len;
- register struct conn *tc;
+ register afs_conn_t *tc;
register struct dcache *tdc;
register struct vcache *tvc;
struct AFSFetchStatus OutDirStatus;
@@ -3719,7 +3719,7 @@
{
register afs_int32 code, code1;
afs_int32 bytes;
- struct conn *tc;
+ afs_conn_t *tc;
struct rx_call *tcall;
struct AFSVolSync tsync;
struct AFSFetchStatus OutStatus;
@@ -3784,7 +3784,7 @@
DECL_PIOCTL(PResidencyCmd)
{
register afs_int32 code;
- struct conn *tc;
+ afs_conn_t *tc;
struct vcache *tvc;
struct ResidencyCmdInputs *Inputs;
struct ResidencyCmdOutputs *Outputs;
@@ -3872,7 +3872,7 @@
int srvAddrCount;
struct server *ts;
struct srvAddr *sa;
- struct conn *tc;
+ afs_conn_t *tc;
afs_int32 i, j;
struct unixuser *tu;
struct srvAddr **addrs;
--- openafs-1.4.8/src/afs/afs_prototypes.h Sat Jun 28 20:26:04 2008
+++ openafs-1.4.8-os/src/afs/afs_prototypes.h Sun Jan 11 18:35:58 2009
@@ -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 afs_conn_t *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 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 afs_conn_t *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 afs_conn_t *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 afs_conn_t *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 afs_conn_t *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 afs_conn_t *ac, afs_int32 locktype);
extern void ForceNewConnections(struct srvAddr *sap);
--- openafs-1.4.8/src/afs/afs_segments.c Tue Dec 4 13:12:16 2007
+++ openafs-1.4.8-os/src/afs/afs_segments.c Sun Jan 11 18:41:01 2009
@@ -40,7 +40,7 @@
int
afs_StoreMini(register struct vcache *avc, struct vrequest *areq)
{
- register struct conn *tc;
+ register afs_conn_t *tc;
struct AFSStoreStatus InStatus;
struct AFSFetchStatus OutStatus;
struct AFSVolSync tsync;
@@ -305,7 +305,7 @@
int nomore;
unsigned int first = 0;
int *shouldwake;
- struct conn *tc;
+ afs_conn_t *tc;
struct osi_file *tfile;
struct rx_call *tcall;
XSTATS_DECLS;
--- openafs-1.4.8/src/afs/afs_server.c Sat Jun 28 20:26:04 2008
+++ openafs-1.4.8-os/src/afs/afs_server.c Sun Jan 11 18:42:13 2009
@@ -288,7 +288,7 @@
CheckVLServer(register struct srvAddr *sa, struct vrequest *areq)
{
register struct server *aserver = sa->server;
- register struct conn *tc;
+ register afs_conn_t *tc;
register afs_int32 code;
AFS_STATCNT(CheckVLServer);
@@ -531,7 +531,7 @@
struct vrequest treq;
struct server *ts;
struct srvAddr *sa;
- struct conn *tc;
+ afs_conn_t *tc;
afs_int32 i, j;
afs_int32 code;
afs_int32 start, end = 0, delta;
@@ -540,7 +540,7 @@
char tbuffer[CVBS];
int srvAddrCount;
struct srvAddr **addrs;
- struct conn **conns;
+ afs_conn_t **conns;
int nconns;
struct rx_connection **rxconns;
afs_int32 *conntimer, *deltas, *results;
@@ -547,7 +547,7 @@
AFS_STATCNT(afs_CheckServers);
- conns = (struct conn **)0;
+ conns = (afs_conn_t **)0;
rxconns = (struct rx_connection **) 0;
conntimer = 0;
nconns = 0;
@@ -577,7 +577,7 @@
ReleaseReadLock(&afs_xsrvAddr);
ReleaseReadLock(&afs_xserver);
- conns = (struct conn **)afs_osi_Alloc(j * sizeof(struct conn *));
+ conns = (afs_conn_t **)afs_osi_Alloc(j * sizeof(afs_conn_t *));
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_osi_Free(addrs, srvAddrCount * sizeof(*addrs));
- afs_osi_Free(conns, j * sizeof(struct conn *));
+ afs_osi_Free(conns, j * sizeof(afs_conn_t *));
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));
--- openafs-1.4.8/src/afs/afs_user.c Wed Dec 20 12:09:06 2006
+++ openafs-1.4.8-os/src/afs/afs_user.c Sun Jan 11 18:42:45 2009
@@ -64,7 +64,7 @@
register int i;
register struct server *ts;
register struct srvAddr *sa;
- register struct conn *tc, **lc;
+ register afs_conn_t *tc, **lc;
AFS_STATCNT(RemoveUserConns);
for (i = 0; i < NSERVERS; i++) {
@@ -77,7 +77,7 @@
AFS_GUNLOCK();
rx_DestroyConnection(tc->id);
AFS_GLOCK();
- afs_osi_Free(tc, sizeof(struct conn));
+ afs_osi_Free(tc, sizeof(afs_conn_t));
break; /* at most one instance per server */
} /*Found unreferenced connection for user */
} /*For each connection on the server */
@@ -232,7 +232,7 @@
{
int i;
struct srvAddr *sa;
- struct conn *tc;
+ afs_conn_t *tc;
AFS_STATCNT(afs_ResetUserConns);
ObtainReadLock(&afs_xsrvAddr);
--- openafs-1.4.8/src/afs/afs_util.c Wed Mar 8 22:41:33 2006
+++ openafs-1.4.8-os/src/afs/afs_util.c Sun Jan 11 18:43:14 2009
@@ -302,7 +302,7 @@
{
struct srvAddr *sa;
struct server *ts;
- struct conn *tc;
+ afs_conn_t *tc;
for (i = 0; i < NSERVERS; i++) {
for (ts = afs_servers[i]; ts; ts = ts->next) {
if (ts->flags & SRVR_ISDOWN)
--- openafs-1.4.8/src/afs/afs_vcache.c Tue Aug 26 07:02:11 2008
+++ openafs-1.4.8-os/src/afs/afs_vcache.c Sun Jan 11 18:44:23 2009
@@ -391,7 +391,7 @@
struct server *tsp;
int i;
struct vrequest treq;
- struct conn *tc;
+ afs_conn_t *tc;
int safety1, safety2, safety3;
XSTATS_DECLS;
if ((code = afs_InitReq(&treq, afs_osi_credp)))
@@ -1173,7 +1173,7 @@
{
register struct vcache *tvc;
register int i;
- register struct conn *tc;
+ register afs_conn_t *tc;
register afs_int32 code;
register struct AFS_UCRED *cred = NULL;
struct vrequest treq, ureq;
@@ -1500,7 +1500,7 @@
struct vrequest *areq)
{
afs_int32 code;
- struct conn *tc;
+ afs_conn_t *tc;
struct AFSFetchStatus OutStatus;
struct AFSVolSync tsync;
XSTATS_DECLS;
@@ -1659,7 +1659,7 @@
{
afs_int32 code;
afs_uint32 start;
- register struct conn *tc;
+ register afs_conn_t *tc;
struct AFSFetchStatus OutDirStatus;
XSTATS_DECLS;
if (!name)
@@ -2359,7 +2359,7 @@
{
int code;
afs_uint32 start = 0;
- register struct conn *tc;
+ register afs_conn_t *tc;
struct AFSCallBack CallBack;
struct AFSVolSync tsync;
struct volume *volp;
@@ -2456,7 +2456,7 @@
void
afs_StuffVcache(register struct VenusFid *afid,
struct AFSFetchStatus *OutStatus,
- struct AFSCallBack *CallBack, register struct conn *tc,
+ struct AFSCallBack *CallBack, register afs_conn_t *tc,
struct vrequest *areq)
{
register afs_int32 code, i, newvcache = 0;
--- openafs-1.4.8/src/afs/afs_volume.c Thu Jan 25 03:24:30 2007
+++ openafs-1.4.8-os/src/afs/afs_volume.c Sun Jan 11 18:44:49 2009
@@ -615,7 +615,7 @@
struct uvldbentry *utve;
struct cell *tcell;
char *tbuffer, *ve;
- struct conn *tconn;
+ afs_conn_t *tconn;
struct vrequest treq;
if (strlen(aname) > VL_MAXNAMELEN) /* Invalid volume name */
@@ -911,7 +911,7 @@
struct cell *tcell, struct vrequest *areq)
{
register struct server *ts;
- struct conn *tconn;
+ afs_conn_t *tconn;
struct cell *cellp;
register int i, j;
afs_uint32 serverid;
--- openafs-1.4.8/src/afs/VNOPS/afs_vnop_create.c Sat Dec 8 10:00:45 2007
+++ openafs-1.4.8-os/src/afs/VNOPS/afs_vnop_create.c Sun Jan 11 18:48:18 2009
@@ -45,7 +45,7 @@
afs_int32 origCBs, origZaps, finalZaps;
struct vrequest treq;
register afs_int32 code;
- register struct conn *tc;
+ register afs_conn_t *tc;
struct VenusFid newFid;
struct AFSStoreStatus InStatus;
struct AFSFetchStatus OutFidStatus, OutDirStatus;
--- openafs-1.4.8/src/afs/VNOPS/afs_vnop_dirops.c Sat Dec 8 10:00:45 2007
+++ openafs-1.4.8-os/src/afs/VNOPS/afs_vnop_dirops.c Sun Jan 11 18:48:50 2009
@@ -41,7 +41,7 @@
{
struct vrequest treq;
register afs_int32 code;
- register struct conn *tc;
+ register afs_conn_t *tc;
struct VenusFid newFid;
register struct dcache *tdc;
afs_size_t offset, len;
@@ -176,7 +176,7 @@
register struct dcache *tdc;
register struct vcache *tvc = NULL;
register afs_int32 code;
- register struct conn *tc;
+ register afs_conn_t *tc;
afs_size_t offset, len;
struct AFSFetchStatus OutDirStatus;
struct AFSVolSync tsync;
--- openafs-1.4.8/src/afs/VNOPS/afs_vnop_flock.c Sat Mar 10 08:08:08 2007
+++ openafs-1.4.8-os/src/afs/VNOPS/afs_vnop_flock.c Sun Jan 11 18:49:21 2009
@@ -225,7 +225,7 @@
HandleFlock(register struct vcache *avc, int acom, struct vrequest *areq,
pid_t clid, int onlymine)
{
- struct conn *tc;
+ afs_conn_t *tc;
struct SimpleLocks *slp, *tlp, **slpp;
afs_int32 code;
struct AFSVolSync tsync;
@@ -809,7 +809,7 @@
static int
GetFlockCount(struct vcache *avc, struct vrequest *areq)
{
- register struct conn *tc;
+ register afs_conn_t *tc;
register afs_int32 code;
struct AFSFetchStatus OutStatus;
struct AFSCallBack CallBack;
--- openafs-1.4.8/src/afs/VNOPS/afs_vnop_link.c Sat Dec 8 10:00:45 2007
+++ openafs-1.4.8-os/src/afs/VNOPS/afs_vnop_link.c Sun Jan 11 18:49:44 2009
@@ -45,7 +45,7 @@
struct vrequest treq;
register struct dcache *tdc;
register afs_int32 code;
- register struct conn *tc;
+ register afs_conn_t *tc;
afs_size_t offset, len;
struct AFSFetchStatus OutFidStatus, OutDirStatus;
struct AFSVolSync tsync;
--- openafs-1.4.8/src/afs/VNOPS/afs_vnop_lookup.c Tue Aug 26 07:02:14 2008
+++ openafs-1.4.8-os/src/afs/VNOPS/afs_vnop_lookup.c Sun Jan 11 18:50:19 2009
@@ -551,7 +551,7 @@
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 */
+ afs_conn_t *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,
--- openafs-1.4.8/src/afs/VNOPS/afs_vnop_remove.c Wed Dec 19 12:59:48 2007
+++ openafs-1.4.8-os/src/afs/VNOPS/afs_vnop_remove.c Sun Jan 11 18:50:46 2009
@@ -105,7 +105,7 @@
struct vrequest *treqp)
{
register afs_int32 code;
- register struct conn *tc;
+ register afs_conn_t *tc;
struct AFSFetchStatus OutDirStatus;
struct AFSVolSync tsync;
XSTATS_DECLS;
--- openafs-1.4.8/src/afs/VNOPS/afs_vnop_rename.c Sat Dec 8 10:00:45 2007
+++ openafs-1.4.8-os/src/afs/VNOPS/afs_vnop_rename.c Sun Jan 11 18:51:11 2009
@@ -36,7 +36,7 @@
afsrename(struct vcache *aodp, char *aname1, struct vcache *andp,
char *aname2, struct AFS_UCRED *acred, struct vrequest *areq)
{
- register struct conn *tc;
+ register afs_conn_t *tc;
register afs_int32 code;
afs_int32 returnCode;
int oneDir, doLocally;
--- openafs-1.4.8/src/afs/VNOPS/afs_vnop_symlink.c Sun Jun 8 20:30:59 2008
+++ openafs-1.4.8-os/src/afs/VNOPS/afs_vnop_symlink.c Sun Jan 11 18:51:38 2009
@@ -52,7 +52,7 @@
afs_uint32 now = 0;
struct vrequest treq;
afs_int32 code;
- struct conn *tc;
+ afs_conn_t *tc;
struct VenusFid newFid;
struct dcache *tdc;
afs_size_t offset, len;
