Index: openafs/src/.gitignore diff -c /dev/null openafs/src/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:01 2009 --- openafs/src/.gitignore Mon Jun 15 18:37:27 2009 *************** *** 0 **** --- 1,6 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /helper-splint.sh + /dauth Index: openafs/src/JAVA/classes/.gitignore diff -c /dev/null openafs/src/JAVA/classes/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:01 2009 --- openafs/src/JAVA/classes/.gitignore Mon Jun 15 18:37:27 2009 *************** *** 0 **** --- 1,6 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + !.classpath + !.project Index: openafs/src/WINNT/afsadmsvr/.gitignore diff -c /dev/null openafs/src/WINNT/afsadmsvr/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:01 2009 --- openafs/src/WINNT/afsadmsvr/.gitignore Mon Jun 15 18:37:27 2009 *************** *** 0 **** --- 1,9 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /iTaAfsAdmSvr.h + /iTaAfsAdmSvrTypes.h + /iTaAfsAdmSvr_c.c + /iTaAfsAdmSvr_s.c + Index: openafs/src/WINNT/client_creds/.gitignore diff -c /dev/null openafs/src/WINNT/client_creds/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:02 2009 --- openafs/src/WINNT/client_creds/.gitignore Mon Jun 15 18:37:27 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + !Makefile Index: openafs/src/WINNT/netidmgr_plugin/extensions/sample/.gitignore diff -c /dev/null openafs/src/WINNT/netidmgr_plugin/extensions/sample/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:03 2009 --- openafs/src/WINNT/netidmgr_plugin/extensions/sample/.gitignore Mon Jun 15 18:37:28 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + !Makefile Index: openafs/src/afs/.gitignore diff -c /dev/null openafs/src/afs/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:03 2009 --- openafs/src/afs/.gitignore Mon Jun 15 18:37:28 2009 *************** *** 0 **** --- 1,9 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /afs_trace.h + /afs_trace.msf + /afszcm.cat + /unified_afs.c + /unified_afs.h Index: openafs/src/afs/afs.h diff -c openafs/src/afs/afs.h:1.48.2.37 openafs/src/afs/afs.h:1.48.2.38 *** openafs/src/afs/afs.h:1.48.2.37 Mon Apr 27 14:33:01 2009 --- openafs/src/afs/afs.h Wed Jun 24 17:30:13 2009 *************** *** 320,328 **** struct afs_exporter *exporter; /* more info about the exporter for the remote user */ }; ! struct conn { /* Per-connection block. */ ! struct 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 */ --- 320,328 ---- struct afs_exporter *exporter; /* more info about the exporter for the remote user */ }; ! struct afs_conn { /* Per-connection block. */ ! 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,360 **** 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 */ 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 */ --- 354,360 ---- 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 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 */ Index: openafs/src/afs/afs_analyze.c diff -c openafs/src/afs/afs_analyze.c:1.22.2.8 openafs/src/afs/afs_analyze.c:1.22.2.9 *** openafs/src/afs/afs_analyze.c:1.22.2.8 Mon Oct 27 19:54:06 2008 --- openafs/src/afs/afs_analyze.c Wed Jun 24 17:30:14 2009 *************** *** 14,20 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_analyze.c,v 1.22.2.8 2008/10/27 23:54:06 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 14,20 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_analyze.c,v 1.22.2.9 2009/06/24 21:30:14 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 323,329 **** VLDB_Same(struct VenusFid *afid, struct vrequest *areq) { struct vrequest treq; ! struct conn *tconn; int i, type = 0; union { struct vldbentry tve; --- 323,329 ---- VLDB_Same(struct VenusFid *afid, struct vrequest *areq) { struct vrequest treq; ! struct afs_conn *tconn; int i, type = 0; union { struct vldbentry tve; *************** *** 537,543 **** * if this is a temporary or permanent error. *------------------------------------------------------------------------*/ int ! afs_Analyze(register struct conn *aconn, afs_int32 acode, struct VenusFid *afid, register struct vrequest *areq, int op, afs_int32 locktype, struct cell *cellp) { --- 537,543 ---- * if this is a temporary or permanent error. *------------------------------------------------------------------------*/ 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) { Index: openafs/src/afs/afs_conn.c diff -c openafs/src/afs/afs_conn.c:1.13.2.5 openafs/src/afs/afs_conn.c:1.13.2.6 *** openafs/src/afs/afs_conn.c:1.13.2.5 Mon Oct 20 12:41:00 2008 --- openafs/src/afs/afs_conn.c Wed Jun 24 17:30:14 2009 *************** *** 14,20 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_conn.c,v 1.13.2.5 2008/10/20 16:41:00 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 14,20 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_conn.c,v 1.13.2.6 2009/06/24 21:30:14 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 52,64 **** unsigned int VNOSERVERS = 0; ! struct 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 srvAddr *lowp = NULL; struct unixuser *tu; int notbusy; --- 52,64 ---- unsigned int VNOSERVERS = 0; ! 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 afs_conn *tconn = NULL; struct srvAddr *lowp = NULL; struct unixuser *tu; int notbusy; *************** *** 132,143 **** } /*afs_Conn */ ! struct 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 rx_securityClass *csec; /*Security class object */ int isec; /*Security index */ int service; --- 132,143 ---- } /*afs_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 afs_conn *tc = 0; struct rx_securityClass *csec; /*Security class object */ int isec; /*Security index */ int service; *************** *** 167,174 **** * 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->user = tu; tc->port = aport; --- 167,174 ---- * gets set, marking the time of its ``birth''. */ UpgradeSToWLock(&afs_xconn, 37); ! 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,271 **** * 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_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 srvAddr *sa = 0; AFS_STATCNT(afs_ConnByHost); --- 260,271 ---- * Having force... true and UTokensBad true simultaneously means that the tokens * went bad and we're supposed to create a new, unauthenticated, connection. */ ! 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 afs_conn *tc = 0; struct srvAddr *sa = 0; AFS_STATCNT(afs_ConnByHost); *************** *** 301,313 **** } /*afs_ConnByHost */ ! struct 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 server *ts; /* try to find any connection from the set */ --- 301,313 ---- } /*afs_ConnByHost */ ! 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 afs_conn *tconn; register struct server *ts; /* try to find any connection from the set */ *************** *** 326,332 **** void ! afs_PutConn(register struct conn *ac, afs_int32 locktype) { AFS_STATCNT(afs_PutConn); ac->refCount--; --- 326,332 ---- void ! afs_PutConn(register struct afs_conn *ac, afs_int32 locktype) { AFS_STATCNT(afs_PutConn); ac->refCount--; *************** *** 340,346 **** void ForceNewConnections(struct srvAddr *sap) { ! struct conn *tc = 0; if (!sap) return; /* defensive check */ --- 340,346 ---- void ForceNewConnections(struct srvAddr *sap) { ! struct afs_conn *tc = 0; if (!sap) return; /* defensive check */ Index: openafs/src/afs/afs_dcache.c diff -c openafs/src/afs/afs_dcache.c:1.42.2.24 openafs/src/afs/afs_dcache.c:1.42.2.25 *** openafs/src/afs/afs_dcache.c:1.42.2.24 Tue Aug 26 10:02:10 2008 --- openafs/src/afs/afs_dcache.c Wed Jun 24 17:30:14 2009 *************** *** 14,20 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_dcache.c,v 1.42.2.24 2008/08/26 14:02:10 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ --- 14,20 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_dcache.c,v 1.42.2.25 2009/06/24 21:30:14 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ *************** *** 1514,1520 **** struct tlocal1 *tsmall = 0; register struct dcache *tdc; register struct osi_file *file; ! register struct conn *tc; int downDCount = 0; struct server *newCallback = NULL; char setNewCallback; --- 1514,1520 ---- struct tlocal1 *tsmall = 0; register struct dcache *tdc; register struct osi_file *file; ! register struct afs_conn *tc; int downDCount = 0; struct server *newCallback = NULL; char setNewCallback; Index: openafs/src/afs/afs_init.c diff -c openafs/src/afs/afs_init.c:1.28.2.9 openafs/src/afs/afs_init.c:1.28.2.10 *** openafs/src/afs/afs_init.c:1.28.2.9 Thu Mar 19 22:32:59 2009 --- openafs/src/afs/afs_init.c Wed Jun 24 17:30:14 2009 *************** *** 17,23 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_init.c,v 1.28.2.9 2009/03/20 02:32:59 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 17,23 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_init.c,v 1.28.2.10 2009/06/24 21:30:14 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 767,773 **** */ { struct server *ts, *nts; ! struct conn *tc, *ntc; register struct afs_cbr *tcbrp, *tbrp; for (i = 0; i < NSERVERS; i++) { --- 767,773 ---- */ { struct server *ts, *nts; ! struct afs_conn *tc, *ntc; register struct afs_cbr *tcbrp, *tbrp; for (i = 0; i < NSERVERS; i++) { *************** *** 784,790 **** AFS_GUNLOCK(); rx_DestroyConnection(tc->id); AFS_GLOCK(); ! afs_osi_Free(tc, sizeof(struct conn)); tc = ntc; } } --- 784,790 ---- AFS_GUNLOCK(); rx_DestroyConnection(tc->id); AFS_GLOCK(); ! afs_osi_Free(tc, sizeof(struct afs_conn)); tc = ntc; } } Index: openafs/src/afs/afs_osi.c diff -c openafs/src/afs/afs_osi.c:1.48.2.21 openafs/src/afs/afs_osi.c:1.48.2.22 *** openafs/src/afs/afs_osi.c:1.48.2.21 Tue May 12 09:03:47 2009 --- openafs/src/afs/afs_osi.c Wed Jun 24 17:54:51 2009 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_osi.c,v 1.48.2.21 2009/05/12 13:03:47 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_osi.c,v 1.48.2.22 2009/06/24 21:54:51 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 843,849 **** void afs_osi_TraverseProcTable() { ! #if !defined(LINUX_KEYRING_SUPPORT) struct task_struct *p; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && defined(EXPORTED_TASKLIST_LOCK) --- 843,849 ---- void afs_osi_TraverseProcTable() { ! #if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_HAS_CRED) || defined(EXPORTED_RCU_READ_LOCK)) struct task_struct *p; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && defined(EXPORTED_TASKLIST_LOCK) *************** *** 1110,1115 **** --- 1110,1116 ---- return rv; } #elif defined(AFS_LINUX22_ENV) + #if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_HAS_CRED) || defined(EXPORTED_RCU_READ_LOCK)) const struct AFS_UCRED * afs_osi_proc2cred(AFS_PROC * pr) { *************** *** 1142,1147 **** --- 1143,1149 ---- return rv; } + #endif #else const struct AFS_UCRED * afs_osi_proc2cred(AFS_PROC * pr) Index: openafs/src/afs/afs_pioctl.c diff -c openafs/src/afs/afs_pioctl.c:1.81.2.36 openafs/src/afs/afs_pioctl.c:1.81.2.38 *** openafs/src/afs/afs_pioctl.c:1.81.2.36 Wed Jun 3 11:14:38 2009 --- openafs/src/afs/afs_pioctl.c Wed Jun 24 19:15:06 2009 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_pioctl.c,v 1.81.2.36 2009/06/03 15:14:38 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #ifdef AFS_OBSD_ENV --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_pioctl.c,v 1.81.2.38 2009/06/24 23:15:06 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #ifdef AFS_OBSD_ENV *************** *** 751,756 **** --- 751,757 ---- #if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) return (code); #endif + return 0; } #endif /* AFS_SGI_ENV */ #endif /* AFS_HPUX102_ENV */ *************** *** 1215,1221 **** DECL_PIOCTL(PSetAcl) { register afs_int32 code; ! struct conn *tconn; struct AFSOpaque acl; struct AFSVolSync tsync; struct AFSFetchStatus OutStatus; --- 1216,1222 ---- DECL_PIOCTL(PSetAcl) { register afs_int32 code; ! struct afs_conn *tconn; struct AFSOpaque acl; struct AFSVolSync tsync; struct AFSFetchStatus OutStatus; *************** *** 1303,1309 **** struct AFSVolSync tsync; struct AFSFetchStatus OutStatus; afs_int32 code; ! struct conn *tconn; struct AFSFid Fid; XSTATS_DECLS; --- 1304,1310 ---- struct AFSVolSync tsync; struct AFSFetchStatus OutStatus; afs_int32 code; ! struct afs_conn *tconn; struct AFSFid Fid; XSTATS_DECLS; *************** *** 1546,1552 **** char volName[32]; char *offLineMsg = afs_osi_Alloc(256); char *motd = afs_osi_Alloc(256); ! register struct conn *tc; register afs_int32 code = 0; struct AFSFetchVolumeStatus volstat; register char *cp; --- 1547,1553 ---- char volName[32]; char *offLineMsg = afs_osi_Alloc(256); char *motd = afs_osi_Alloc(256); ! register struct afs_conn *tc; register afs_int32 code = 0; struct AFSFetchVolumeStatus volstat; register char *cp; *************** *** 1601,1607 **** char volName[32]; char *offLineMsg = afs_osi_Alloc(256); char *motd = afs_osi_Alloc(256); ! register struct conn *tc; register afs_int32 code = 0; struct AFSFetchVolumeStatus volstat; struct AFSStoreVolumeStatus storeStat; --- 1602,1608 ---- char volName[32]; char *offLineMsg = afs_osi_Alloc(256); char *motd = afs_osi_Alloc(256); ! register struct afs_conn *tc; register afs_int32 code = 0; struct AFSFetchVolumeStatus volstat; struct AFSStoreVolumeStatus storeStat; *************** *** 2040,2046 **** { int i; struct srvAddr *sa; ! struct conn *tc; struct unixuser *tu; afs_int32 retValue; --- 2041,2047 ---- { int i; struct srvAddr *sa; ! struct afs_conn *tc; struct unixuser *tu; afs_int32 retValue; *************** *** 2206,2212 **** DECL_PIOCTL(PRemoveCallBack) { ! register struct conn *tc; register afs_int32 code = 0; struct AFSCallBack CallBacks_Array[1]; struct AFSCBFids theFids; --- 2207,2213 ---- DECL_PIOCTL(PRemoveCallBack) { ! register struct afs_conn *tc; register afs_int32 code = 0; struct AFSCallBack CallBacks_Array[1]; struct AFSCBFids theFids; *************** *** 2399,2405 **** char *bufp; struct sysname_info sysState; afs_size_t offset, len; ! register struct conn *tc; register struct dcache *tdc; register struct vcache *tvc; struct AFSFetchStatus OutDirStatus; --- 2400,2406 ---- char *bufp; struct sysname_info sysState; afs_size_t offset, len; ! register struct afs_conn *tc; register struct dcache *tdc; register struct vcache *tvc; struct AFSFetchStatus OutDirStatus; *************** *** 3723,3729 **** { register afs_int32 code, code1; afs_int32 bytes; ! struct conn *tc; struct rx_call *tcall; struct AFSVolSync tsync; struct AFSFetchStatus OutStatus; --- 3724,3730 ---- { register afs_int32 code, code1; afs_int32 bytes; ! struct afs_conn *tc; struct rx_call *tcall; struct AFSVolSync tsync; struct AFSFetchStatus OutStatus; *************** *** 3788,3794 **** DECL_PIOCTL(PFsCmd) { register afs_int32 code; ! struct conn *tc; struct vcache *tvc; struct FsCmdInputs *Inputs; struct FsCmdOutputs *Outputs; --- 3789,3795 ---- DECL_PIOCTL(PFsCmd) { register afs_int32 code; ! struct afs_conn *tc; struct vcache *tvc; struct FsCmdInputs *Inputs; struct FsCmdOutputs *Outputs; *************** *** 3903,3909 **** int srvAddrCount; struct server *ts; struct srvAddr *sa; ! struct conn *tc; afs_int32 i, j; struct unixuser *tu; struct srvAddr **addrs; --- 3904,3910 ---- int srvAddrCount; struct server *ts; struct srvAddr *sa; ! struct afs_conn *tc; afs_int32 i, j; struct unixuser *tu; struct srvAddr **addrs; Index: openafs/src/afs/afs_prototypes.h diff -c openafs/src/afs/afs_prototypes.h:1.53.2.28 openafs/src/afs/afs_prototypes.h:1.53.2.29 *** openafs/src/afs/afs_prototypes.h:1.53.2.28 Mon Apr 27 14:33:01 2009 --- openafs/src/afs/afs_prototypes.h Wed Jun 24 17:30:14 2009 *************** *** 13,19 **** /* 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, 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); --- 13,19 ---- /* afs_analyze.c */ extern void init_et_to_sys_error(void); extern void afs_FinalizeReq(struct vrequest *areq); ! 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,266 **** 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, register struct vrequest *areq, afs_int32 locktype); ! extern struct 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[], unsigned short aport, afs_int32 acell, register struct vrequest *areq, afs_int32 locktype); ! extern struct 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 ForceNewConnections(struct srvAddr *sap); --- 245,266 ---- extern afs_int32 cryptall; extern afs_rwlock_t afs_xinterface; extern afs_rwlock_t afs_xconn; ! extern struct afs_conn *afs_Conn(register struct VenusFid *afid, register struct vrequest *areq, afs_int32 locktype); ! 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 afs_conn *afs_ConnByMHosts(struct server *ahosts[], unsigned short aport, afs_int32 acell, register struct vrequest *areq, afs_int32 locktype); ! 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 afs_conn *ac, afs_int32 locktype); extern void ForceNewConnections(struct srvAddr *sap); Index: openafs/src/afs/afs_segments.c diff -c openafs/src/afs/afs_segments.c:1.16.2.7 openafs/src/afs/afs_segments.c:1.16.2.8 *** openafs/src/afs/afs_segments.c:1.16.2.7 Tue May 12 12:42:48 2009 --- openafs/src/afs/afs_segments.c Wed Jun 24 17:30:14 2009 *************** *** 14,20 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_segments.c,v 1.16.2.7 2009/05/12 16:42:48 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ --- 14,20 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_segments.c,v 1.16.2.8 2009/06/24 21:30:14 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ *************** *** 40,46 **** int afs_StoreMini(register struct vcache *avc, struct vrequest *areq) { ! register struct conn *tc; struct AFSStoreStatus InStatus; struct AFSFetchStatus OutStatus; struct AFSVolSync tsync; --- 40,46 ---- int afs_StoreMini(register struct vcache *avc, struct vrequest *areq) { ! register struct afs_conn *tc; struct AFSStoreStatus InStatus; struct AFSFetchStatus OutStatus; struct AFSVolSync tsync; *************** *** 305,311 **** int nomore; unsigned int first = 0; int *shouldwake; ! struct conn *tc; struct osi_file *tfile; struct rx_call *tcall; XSTATS_DECLS; --- 305,311 ---- int nomore; unsigned int first = 0; int *shouldwake; ! struct afs_conn *tc; struct osi_file *tfile; struct rx_call *tcall; XSTATS_DECLS; Index: openafs/src/afs/afs_server.c diff -c openafs/src/afs/afs_server.c:1.33.2.13 openafs/src/afs/afs_server.c:1.33.2.14 *** openafs/src/afs/afs_server.c:1.33.2.13 Sat Jun 28 23:26:04 2008 --- openafs/src/afs/afs_server.c Wed Jun 24 17:30:14 2009 *************** *** 33,39 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_server.c,v 1.33.2.13 2008/06/29 03:26:04 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 33,39 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_server.c,v 1.33.2.14 2009/06/24 21:30:14 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 288,294 **** CheckVLServer(register struct srvAddr *sa, struct vrequest *areq) { register struct server *aserver = sa->server; ! register struct conn *tc; register afs_int32 code; AFS_STATCNT(CheckVLServer); --- 288,294 ---- CheckVLServer(register struct srvAddr *sa, struct vrequest *areq) { register struct server *aserver = sa->server; ! register struct afs_conn *tc; register afs_int32 code; AFS_STATCNT(CheckVLServer); *************** *** 531,537 **** struct vrequest treq; struct server *ts; struct srvAddr *sa; ! struct conn *tc; afs_int32 i, j; afs_int32 code; afs_int32 start, end = 0, delta; --- 531,537 ---- struct vrequest treq; struct server *ts; struct srvAddr *sa; ! struct afs_conn *tc; afs_int32 i, j; afs_int32 code; afs_int32 start, end = 0, delta; *************** *** 540,553 **** char tbuffer[CVBS]; int srvAddrCount; struct srvAddr **addrs; ! struct conn **conns; int nconns; struct rx_connection **rxconns; afs_int32 *conntimer, *deltas, *results; AFS_STATCNT(afs_CheckServers); ! conns = (struct conn **)0; rxconns = (struct rx_connection **) 0; conntimer = 0; nconns = 0; --- 540,553 ---- char tbuffer[CVBS]; int srvAddrCount; struct srvAddr **addrs; ! struct afs_conn **conns; int nconns; struct rx_connection **rxconns; afs_int32 *conntimer, *deltas, *results; AFS_STATCNT(afs_CheckServers); ! conns = (struct afs_conn **)0; rxconns = (struct rx_connection **) 0; conntimer = 0; nconns = 0; *************** *** 577,583 **** ReleaseReadLock(&afs_xsrvAddr); ReleaseReadLock(&afs_xserver); ! conns = (struct conn **)afs_osi_Alloc(j * sizeof(struct 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)); --- 577,583 ---- ReleaseReadLock(&afs_xsrvAddr); ReleaseReadLock(&afs_xserver); ! 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,751 **** } afs_osi_Free(addrs, srvAddrCount * sizeof(*addrs)); ! afs_osi_Free(conns, j * sizeof(struct 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)); --- 745,751 ---- } afs_osi_Free(addrs, srvAddrCount * sizeof(*addrs)); ! 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)); Index: openafs/src/afs/afs_user.c diff -c openafs/src/afs/afs_user.c:1.15.2.1 openafs/src/afs/afs_user.c:1.15.2.4 *** openafs/src/afs/afs_user.c:1.15.2.1 Wed Dec 20 15:09:06 2006 --- openafs/src/afs/afs_user.c Thu Jun 25 08:13:34 2009 *************** *** 14,20 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_user.c,v 1.15.2.1 2006/12/20 20:09:06 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 14,20 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_user.c,v 1.15.2.4 2009/06/25 12:13:34 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 64,70 **** register int i; register struct server *ts; register struct srvAddr *sa; ! register struct conn *tc, **lc; AFS_STATCNT(RemoveUserConns); for (i = 0; i < NSERVERS; i++) { --- 64,70 ---- register int i; register struct server *ts; register struct srvAddr *sa; ! register struct afs_conn *tc, **lc; AFS_STATCNT(RemoveUserConns); for (i = 0; i < NSERVERS; i++) { *************** *** 77,83 **** AFS_GUNLOCK(); rx_DestroyConnection(tc->id); AFS_GLOCK(); ! afs_osi_Free(tc, sizeof(struct conn)); break; /* at most one instance per server */ } /*Found unreferenced connection for user */ } /*For each connection on the server */ --- 77,83 ---- AFS_GUNLOCK(); rx_DestroyConnection(tc->id); AFS_GLOCK(); ! 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,238 **** { int i; struct srvAddr *sa; ! struct conn *tc; AFS_STATCNT(afs_ResetUserConns); ObtainReadLock(&afs_xsrvAddr); --- 232,238 ---- { int i; struct srvAddr *sa; ! struct afs_conn *tc; AFS_STATCNT(afs_ResetUserConns); ObtainReadLock(&afs_xsrvAddr); *************** *** 581,586 **** --- 581,587 ---- /* * LOCKS: afs_GCPAGs_perproc_func requires write lock on afs_xuser */ + #if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_HAS_CRED) || defined(EXPORTED_RCU_READ_LOCK)) void afs_GCPAGs_perproc_func(AFS_PROC * pproc) { *************** *** 629,634 **** --- 630,636 ---- } } } + #endif /* * Go through the process table, find all unused PAGs Index: openafs/src/afs/afs_util.c diff -c openafs/src/afs/afs_util.c:1.17.2.3 openafs/src/afs/afs_util.c:1.17.2.4 *** openafs/src/afs/afs_util.c:1.17.2.3 Thu Mar 9 01:41:33 2006 --- openafs/src/afs/afs_util.c Wed Jun 24 17:30:14 2009 *************** *** 16,22 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_util.c,v 1.17.2.3 2006/03/09 06:41:33 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 16,22 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_util.c,v 1.17.2.4 2009/06/24 21:30:14 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 302,308 **** { struct srvAddr *sa; struct server *ts; ! struct conn *tc; for (i = 0; i < NSERVERS; i++) { for (ts = afs_servers[i]; ts; ts = ts->next) { if (ts->flags & SRVR_ISDOWN) --- 302,308 ---- { struct srvAddr *sa; struct server *ts; ! struct afs_conn *tc; for (i = 0; i < NSERVERS; i++) { for (ts = afs_servers[i]; ts; ts = ts->next) { if (ts->flags & SRVR_ISDOWN) Index: openafs/src/afs/afs_vcache.c diff -c openafs/src/afs/afs_vcache.c:1.65.2.55 openafs/src/afs/afs_vcache.c:1.65.2.56 *** openafs/src/afs/afs_vcache.c:1.65.2.55 Tue Mar 31 08:41:47 2009 --- openafs/src/afs/afs_vcache.c Wed Jun 24 17:30:14 2009 *************** *** 39,45 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_vcache.c,v 1.65.2.55 2009/03/31 12:41:47 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ --- 39,45 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_vcache.c,v 1.65.2.56 2009/06/24 21:30:14 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ *************** *** 396,402 **** struct server *tsp; int i; struct vrequest treq; ! struct conn *tc; int safety1, safety2, safety3; XSTATS_DECLS; if ((code = afs_InitReq(&treq, afs_osi_credp))) --- 396,402 ---- struct server *tsp; int i; struct vrequest treq; ! struct afs_conn *tc; int safety1, safety2, safety3; XSTATS_DECLS; if ((code = afs_InitReq(&treq, afs_osi_credp))) *************** *** 1226,1232 **** { register struct vcache *tvc; register int i; ! register struct conn *tc; register afs_int32 code; register struct AFS_UCRED *cred = NULL; struct vrequest treq, ureq; --- 1226,1232 ---- { register struct vcache *tvc; register int i; ! register struct afs_conn *tc; register afs_int32 code; register struct AFS_UCRED *cred = NULL; struct vrequest treq, ureq; *************** *** 1553,1559 **** struct vrequest *areq) { afs_int32 code; ! struct conn *tc; struct AFSFetchStatus OutStatus; struct AFSVolSync tsync; XSTATS_DECLS; --- 1553,1559 ---- struct vrequest *areq) { afs_int32 code; ! struct afs_conn *tc; struct AFSFetchStatus OutStatus; struct AFSVolSync tsync; XSTATS_DECLS; *************** *** 1712,1718 **** { afs_int32 code; afs_uint32 start; ! register struct conn *tc; struct AFSFetchStatus OutDirStatus; XSTATS_DECLS; if (!name) --- 1712,1718 ---- { afs_int32 code; afs_uint32 start; ! register struct afs_conn *tc; struct AFSFetchStatus OutDirStatus; XSTATS_DECLS; if (!name) *************** *** 2412,2418 **** { int code; afs_uint32 start = 0; ! register struct conn *tc; struct AFSCallBack CallBack; struct AFSVolSync tsync; struct volume *volp; --- 2412,2418 ---- { int code; afs_uint32 start = 0; ! register struct afs_conn *tc; struct AFSCallBack CallBack; struct AFSVolSync tsync; struct volume *volp; *************** *** 2509,2515 **** void afs_StuffVcache(register struct VenusFid *afid, struct AFSFetchStatus *OutStatus, ! struct AFSCallBack *CallBack, register struct conn *tc, struct vrequest *areq) { register afs_int32 code, i, newvcache = 0; --- 2509,2515 ---- void afs_StuffVcache(register struct VenusFid *afid, struct AFSFetchStatus *OutStatus, ! struct AFSCallBack *CallBack, register struct afs_conn *tc, struct vrequest *areq) { register afs_int32 code, i, newvcache = 0; Index: openafs/src/afs/afs_volume.c diff -c openafs/src/afs/afs_volume.c:1.26.2.7 openafs/src/afs/afs_volume.c:1.26.2.8 *** openafs/src/afs/afs_volume.c:1.26.2.7 Thu Jan 25 06:24:30 2007 --- openafs/src/afs/afs_volume.c Wed Jun 24 17:30:14 2009 *************** *** 19,25 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_volume.c,v 1.26.2.7 2007/01/25 11:24:30 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 19,25 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_volume.c,v 1.26.2.8 2009/06/24 21:30:14 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 615,621 **** struct uvldbentry *utve; struct cell *tcell; char *tbuffer, *ve; ! struct conn *tconn; struct vrequest treq; if (strlen(aname) > VL_MAXNAMELEN) /* Invalid volume name */ --- 615,621 ---- struct uvldbentry *utve; struct cell *tcell; char *tbuffer, *ve; ! struct afs_conn *tconn; struct vrequest treq; if (strlen(aname) > VL_MAXNAMELEN) /* Invalid volume name */ *************** *** 911,917 **** struct cell *tcell, struct vrequest *areq) { register struct server *ts; ! struct conn *tconn; struct cell *cellp; register int i, j; afs_uint32 serverid; --- 911,917 ---- struct cell *tcell, struct vrequest *areq) { register struct server *ts; ! struct afs_conn *tconn; struct cell *cellp; register int i, j; afs_uint32 serverid; Index: openafs/src/afs/LINUX/.gitignore diff -c /dev/null openafs/src/afs/LINUX/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:03 2009 --- openafs/src/afs/LINUX/.gitignore Mon Jun 15 18:37:28 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /osi_vfs.h Index: openafs/src/afs/LINUX/osi_file.c diff -c openafs/src/afs/LINUX/osi_file.c:1.19.2.19 openafs/src/afs/LINUX/osi_file.c:1.19.2.20 *** openafs/src/afs/LINUX/osi_file.c:1.19.2.19 Thu Jan 15 08:27:43 2009 --- openafs/src/afs/LINUX/osi_file.c Mon Jun 22 11:25:43 2009 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_file.c,v 1.19.2.19 2009/01/15 13:27:43 shadow Exp $"); #ifdef AFS_LINUX24_ENV #include "h/module.h" /* early to avoid printf->printk mapping */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_file.c,v 1.19.2.20 2009/06/22 15:25:43 shadow Exp $"); #ifdef AFS_LINUX24_ENV #include "h/module.h" /* early to avoid printf->printk mapping */ *************** *** 234,242 **** code = inode_change_ok(inode, &newattrs); if (!code) #ifdef INODE_SETATTR_NOT_VOID ! code = inode_setattr(inode, &newattrs); #else ! inode_setattr(inode, &newattrs); #endif unlock_kernel(); if (!code) --- 234,247 ---- code = inode_change_ok(inode, &newattrs); if (!code) #ifdef INODE_SETATTR_NOT_VOID ! #if defined(AFS_LINUX26_ENV) ! if (inode->i_op && inode->i_op->setattr) ! code = inode->i_op->setattr(afile->filp->f_dentry, &newattrs); ! else ! #endif ! code = inode_setattr(inode, &newattrs); #else ! inode_setattr(inode, &newattrs); #endif unlock_kernel(); if (!code) Index: openafs/src/afs/LINUX/osi_groups.c diff -c openafs/src/afs/LINUX/osi_groups.c:1.25.2.20 openafs/src/afs/LINUX/osi_groups.c:1.25.2.21 *** openafs/src/afs/LINUX/osi_groups.c:1.25.2.20 Mon Mar 23 11:17:02 2009 --- openafs/src/afs/LINUX/osi_groups.c Wed Jun 24 17:55:01 2009 *************** *** 20,26 **** #endif RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_groups.c,v 1.25.2.20 2009/03/23 15:17:02 shadow Exp $"); #include "afs/sysincludes.h" #include "afsincludes.h" --- 20,26 ---- #endif RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_groups.c,v 1.25.2.21 2009/06/24 21:55:01 shadow Exp $"); #include "afs/sysincludes.h" #include "afsincludes.h" *************** *** 228,234 **** static struct key_type *__key_type_keyring = &key_type_keyring; static int ! install_session_keyring(struct task_struct *task, struct key *keyring) { struct key *old; char desc[20]; --- 228,234 ---- static struct key_type *__key_type_keyring = &key_type_keyring; static int ! install_session_keyring(struct key *keyring) { struct key *old; char desc[20]; *************** *** 242,262 **** /* create an empty session keyring */ not_in_quota = KEY_ALLOC_IN_QUOTA; ! sprintf(desc, "_ses.%u", task->tgid); #if defined(KEY_ALLOC_NEEDS_STRUCT_TASK) keyring = key_alloc(__key_type_keyring, desc, ! task_uid(task), task_gid(task), task, (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL, not_in_quota); #elif defined(KEY_ALLOC_NEEDS_CRED) keyring = key_alloc(__key_type_keyring, desc, ! task_uid(task), task_gid(task), current_cred(), (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL, not_in_quota); #else keyring = key_alloc(__key_type_keyring, desc, ! task_uid(task), task_gid(task), (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL, not_in_quota); #endif --- 242,262 ---- /* create an empty session keyring */ not_in_quota = KEY_ALLOC_IN_QUOTA; ! sprintf(desc, "_ses.%u", current->tgid); #if defined(KEY_ALLOC_NEEDS_STRUCT_TASK) keyring = key_alloc(__key_type_keyring, desc, ! current_uid(), current_gid(), current, (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL, not_in_quota); #elif defined(KEY_ALLOC_NEEDS_CRED) keyring = key_alloc(__key_type_keyring, desc, ! current_uid(), current_gid(), current_cred(), (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL, not_in_quota); #else keyring = key_alloc(__key_type_keyring, desc, ! current_uid(), current_gid(), (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL, not_in_quota); #endif *************** *** 273,283 **** } /* install the keyring */ ! spin_lock_irq(&task->sighand->siglock); ! old = task_session_keyring(task); smp_wmb(); ! task_session_keyring(task) = keyring; ! spin_unlock_irq(&task->sighand->siglock); if (old) key_put(old); --- 273,283 ---- } /* install the keyring */ ! spin_lock_irq(¤t->sighand->siglock); ! old = task_session_keyring(current); smp_wmb(); ! task_session_keyring(current) = keyring; ! spin_unlock_irq(¤t->sighand->siglock); if (old) key_put(old); *************** *** 340,346 **** #ifdef LINUX_KEYRING_SUPPORT if (code == 0) { ! (void) install_session_keyring(current, NULL); if (current_session_keyring()) { struct key *key; --- 340,346 ---- #ifdef LINUX_KEYRING_SUPPORT if (code == 0) { ! (void) install_session_keyring(NULL); if (current_session_keyring()) { struct key *key; *************** *** 658,664 **** --- 658,667 ---- #if defined(EXPORTED_FIND_TASK_BY_PID) p = find_task_by_pid(1); #else + p = pid_task(1, PIDTYPE_PID); + /* p = find_task_by_vpid(1); + */ #endif if (p && task_user(p)->session_keyring) __key_type_keyring = task_user(p)->session_keyring->type; Index: openafs/src/afs/VNOPS/afs_vnop_create.c diff -c openafs/src/afs/VNOPS/afs_vnop_create.c:1.16.2.11 openafs/src/afs/VNOPS/afs_vnop_create.c:1.16.2.12 *** openafs/src/afs/VNOPS/afs_vnop_create.c:1.16.2.11 Mon Dec 29 16:26:25 2008 --- openafs/src/afs/VNOPS/afs_vnop_create.c Wed Jun 24 17:30:19 2009 *************** *** 17,23 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_create.c,v 1.16.2.11 2008/12/29 21:26:25 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 17,23 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_create.c,v 1.16.2.12 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 45,51 **** afs_int32 origCBs, origZaps, finalZaps; struct vrequest treq; register afs_int32 code; ! register struct conn *tc; struct VenusFid newFid; struct AFSStoreStatus InStatus; struct AFSFetchStatus OutFidStatus, OutDirStatus; --- 45,51 ---- afs_int32 origCBs, origZaps, finalZaps; struct vrequest treq; register afs_int32 code; ! register struct afs_conn *tc; struct VenusFid newFid; struct AFSStoreStatus InStatus; struct AFSFetchStatus OutFidStatus, OutDirStatus; Index: openafs/src/afs/VNOPS/afs_vnop_dirops.c diff -c openafs/src/afs/VNOPS/afs_vnop_dirops.c:1.14.2.6 openafs/src/afs/VNOPS/afs_vnop_dirops.c:1.14.2.7 *** openafs/src/afs/VNOPS/afs_vnop_dirops.c:1.14.2.6 Sat Dec 8 13:00:45 2007 --- openafs/src/afs/VNOPS/afs_vnop_dirops.c Wed Jun 24 17:30:19 2009 *************** *** 21,27 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_dirops.c,v 1.14.2.6 2007/12/08 18:00:45 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 21,27 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_dirops.c,v 1.14.2.7 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 41,47 **** { struct vrequest treq; register afs_int32 code; ! register struct conn *tc; struct VenusFid newFid; register struct dcache *tdc; afs_size_t offset, len; --- 41,47 ---- { struct vrequest treq; register afs_int32 code; ! register struct afs_conn *tc; struct VenusFid newFid; register struct dcache *tdc; afs_size_t offset, len; *************** *** 176,182 **** register struct dcache *tdc; register struct vcache *tvc = NULL; register afs_int32 code; ! register struct conn *tc; afs_size_t offset, len; struct AFSFetchStatus OutDirStatus; struct AFSVolSync tsync; --- 176,182 ---- register struct dcache *tdc; register struct vcache *tvc = NULL; register afs_int32 code; ! register struct afs_conn *tc; afs_size_t offset, len; struct AFSFetchStatus OutDirStatus; struct AFSVolSync tsync; Index: openafs/src/afs/VNOPS/afs_vnop_flock.c diff -c openafs/src/afs/VNOPS/afs_vnop_flock.c:1.24.2.11 openafs/src/afs/VNOPS/afs_vnop_flock.c:1.24.2.12 *** openafs/src/afs/VNOPS/afs_vnop_flock.c:1.24.2.11 Wed Jun 3 14:26:02 2009 --- openafs/src/afs/VNOPS/afs_vnop_flock.c Wed Jun 24 17:30:19 2009 *************** *** 16,22 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_flock.c,v 1.24.2.11 2009/06/03 18:26:02 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 16,22 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_flock.c,v 1.24.2.12 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 225,231 **** HandleFlock(register struct vcache *avc, int acom, struct vrequest *areq, pid_t clid, int onlymine) { ! struct conn *tc; struct SimpleLocks *slp, *tlp, **slpp; afs_int32 code; struct AFSVolSync tsync; --- 225,231 ---- HandleFlock(register struct vcache *avc, int acom, struct vrequest *areq, pid_t clid, int onlymine) { ! struct afs_conn *tc; struct SimpleLocks *slp, *tlp, **slpp; afs_int32 code; struct AFSVolSync tsync; *************** *** 809,815 **** static int GetFlockCount(struct vcache *avc, struct vrequest *areq) { ! register struct conn *tc; register afs_int32 code; struct AFSFetchStatus OutStatus; struct AFSCallBack CallBack; --- 809,815 ---- static int GetFlockCount(struct vcache *avc, struct vrequest *areq) { ! register struct afs_conn *tc; register afs_int32 code; struct AFSFetchStatus OutStatus; struct AFSCallBack CallBack; Index: openafs/src/afs/VNOPS/afs_vnop_link.c diff -c openafs/src/afs/VNOPS/afs_vnop_link.c:1.15.2.5 openafs/src/afs/VNOPS/afs_vnop_link.c:1.15.2.6 *** openafs/src/afs/VNOPS/afs_vnop_link.c:1.15.2.5 Sat Dec 8 13:00:45 2007 --- openafs/src/afs/VNOPS/afs_vnop_link.c Wed Jun 24 17:30:19 2009 *************** *** 17,23 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_link.c,v 1.15.2.5 2007/12/08 18:00:45 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 17,23 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_link.c,v 1.15.2.6 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 45,51 **** struct vrequest treq; register struct dcache *tdc; register afs_int32 code; ! register struct conn *tc; afs_size_t offset, len; struct AFSFetchStatus OutFidStatus, OutDirStatus; struct AFSVolSync tsync; --- 45,51 ---- struct vrequest treq; register struct dcache *tdc; register afs_int32 code; ! register struct afs_conn *tc; afs_size_t offset, len; struct AFSFetchStatus OutFidStatus, OutDirStatus; struct AFSVolSync tsync; Index: openafs/src/afs/VNOPS/afs_vnop_lookup.c diff -c openafs/src/afs/VNOPS/afs_vnop_lookup.c:1.50.2.24 openafs/src/afs/VNOPS/afs_vnop_lookup.c:1.50.2.25 *** openafs/src/afs/VNOPS/afs_vnop_lookup.c:1.50.2.24 Mon Apr 6 18:53:16 2009 --- openafs/src/afs/VNOPS/afs_vnop_lookup.c Wed Jun 24 17:30:19 2009 *************** *** 18,24 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_lookup.c,v 1.50.2.24 2009/04/06 22:53:16 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 18,24 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_lookup.c,v 1.50.2.25 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 549,555 **** 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 */ AFSCBs cbParm; /* callback parm for bulk stat */ struct server *hostp = 0; /* host we got callback from */ long startTime; /* time we started the call, --- 549,555 ---- AFSCBFids fidParm; /* file ID parm for bulk stat */ AFSBulkStats statParm; /* stat info parm for bulk stat */ int fidIndex = 0; /* which file were stating */ ! 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, Index: openafs/src/afs/VNOPS/afs_vnop_remove.c diff -c openafs/src/afs/VNOPS/afs_vnop_remove.c:1.31.2.17 openafs/src/afs/VNOPS/afs_vnop_remove.c:1.31.2.18 *** openafs/src/afs/VNOPS/afs_vnop_remove.c:1.31.2.17 Wed Dec 19 15:59:48 2007 --- openafs/src/afs/VNOPS/afs_vnop_remove.c Wed Jun 24 17:30:19 2009 *************** *** 21,27 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_remove.c,v 1.31.2.17 2007/12/19 20:59:48 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 21,27 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_remove.c,v 1.31.2.18 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 105,111 **** struct vrequest *treqp) { register afs_int32 code; ! register struct conn *tc; struct AFSFetchStatus OutDirStatus; struct AFSVolSync tsync; XSTATS_DECLS; --- 105,111 ---- struct vrequest *treqp) { register afs_int32 code; ! register struct afs_conn *tc; struct AFSFetchStatus OutDirStatus; struct AFSVolSync tsync; XSTATS_DECLS; Index: openafs/src/afs/VNOPS/afs_vnop_rename.c diff -c openafs/src/afs/VNOPS/afs_vnop_rename.c:1.16.2.12 openafs/src/afs/VNOPS/afs_vnop_rename.c:1.16.2.13 *** openafs/src/afs/VNOPS/afs_vnop_rename.c:1.16.2.12 Sat Dec 8 13:00:45 2007 --- openafs/src/afs/VNOPS/afs_vnop_rename.c Wed Jun 24 17:30:19 2009 *************** *** 18,24 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_rename.c,v 1.16.2.12 2007/12/08 18:00:45 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 18,24 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_rename.c,v 1.16.2.13 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 36,42 **** afsrename(struct vcache *aodp, char *aname1, struct vcache *andp, char *aname2, struct AFS_UCRED *acred, struct vrequest *areq) { ! register struct conn *tc; register afs_int32 code; afs_int32 returnCode; int oneDir, doLocally; --- 36,42 ---- afsrename(struct vcache *aodp, char *aname1, struct vcache *andp, char *aname2, struct AFS_UCRED *acred, struct vrequest *areq) { ! register struct afs_conn *tc; register afs_int32 code; afs_int32 returnCode; int oneDir, doLocally; Index: openafs/src/afs/VNOPS/afs_vnop_symlink.c diff -c openafs/src/afs/VNOPS/afs_vnop_symlink.c:1.19.2.7 openafs/src/afs/VNOPS/afs_vnop_symlink.c:1.19.2.8 *** openafs/src/afs/VNOPS/afs_vnop_symlink.c:1.19.2.7 Sun Jun 8 23:30:59 2008 --- openafs/src/afs/VNOPS/afs_vnop_symlink.c Wed Jun 24 17:30:19 2009 *************** *** 22,28 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_symlink.c,v 1.19.2.7 2008/06/09 03:30:59 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 22,28 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_symlink.c,v 1.19.2.8 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 52,58 **** afs_uint32 now = 0; struct vrequest treq; afs_int32 code; ! struct conn *tc; struct VenusFid newFid; struct dcache *tdc; afs_size_t offset, len; --- 52,58 ---- afs_uint32 now = 0; struct vrequest treq; afs_int32 code; ! struct afs_conn *tc; struct VenusFid newFid; struct dcache *tdc; afs_size_t offset, len; Index: openafs/src/afsd/.gitignore diff -c /dev/null openafs/src/afsd/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/afsd/.gitignore Mon Jun 15 18:37:28 2009 *************** *** 0 **** --- 1,7 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /afs.ppc_darwin.plist + /afsd + /vsys Index: openafs/src/afsmonitor/.gitignore diff -c /dev/null openafs/src/afsmonitor/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/afsmonitor/.gitignore Mon Jun 15 18:37:28 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /afsmonitor Index: openafs/src/afsweb/apache_includes/1.2/httpd.h diff -c openafs/src/afsweb/apache_includes/1.2/httpd.h:1.2 openafs/src/afsweb/apache_includes/1.2/httpd.h:1.2.2.1 *** openafs/src/afsweb/apache_includes/1.2/httpd.h:1.2 Tue Jul 15 19:14:36 2003 --- openafs/src/afsweb/apache_includes/1.2/httpd.h Wed Jun 24 17:30:19 2009 *************** *** 429,435 **** }; ! typedef struct conn_rec conn_rec; typedef struct server_rec server_rec; typedef struct request_rec request_rec; typedef struct listen_rec listen_rec; --- 429,435 ---- }; ! 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,559 **** /* Things which are per connection */ ! struct conn_rec { pool *pool; server_rec *server; --- 553,559 ---- /* Things which are per connection */ ! struct afs_conn_rec { pool *pool; server_rec *server; Index: openafs/src/afsweb/apache_includes/1.3.1/httpd.h diff -c openafs/src/afsweb/apache_includes/1.3.1/httpd.h:1.2 openafs/src/afsweb/apache_includes/1.3.1/httpd.h:1.2.2.1 *** openafs/src/afsweb/apache_includes/1.3.1/httpd.h:1.2 Tue Jul 15 19:14:37 2003 --- openafs/src/afsweb/apache_includes/1.3.1/httpd.h Wed Jun 24 17:30:19 2009 *************** *** 565,571 **** const struct htaccess_result *next; }; ! typedef struct conn_rec conn_rec; typedef struct server_rec server_rec; typedef struct request_rec request_rec; typedef struct listen_rec listen_rec; --- 565,571 ---- const struct htaccess_result *next; }; ! 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,724 **** /* Things which are per connection */ ! struct conn_rec { ap_pool *pool; server_rec *server; --- 718,724 ---- /* Things which are per connection */ ! struct afs_conn_rec { ap_pool *pool; server_rec *server; Index: openafs/src/afsweb/apache_includes/1.3.6/httpd.h diff -c openafs/src/afsweb/apache_includes/1.3.6/httpd.h:1.2 openafs/src/afsweb/apache_includes/1.3.6/httpd.h:1.2.2.1 *** openafs/src/afsweb/apache_includes/1.3.6/httpd.h:1.2 Tue Jul 15 19:14:38 2003 --- openafs/src/afsweb/apache_includes/1.3.6/httpd.h Wed Jun 24 17:30:20 2009 *************** *** 622,628 **** const struct htaccess_result *next; }; ! typedef struct conn_rec conn_rec; typedef struct server_rec server_rec; typedef struct request_rec request_rec; typedef struct listen_rec listen_rec; --- 622,628 ---- const struct htaccess_result *next; }; ! 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,790 **** /* Things which are per connection */ ! struct conn_rec { ap_pool *pool; server_rec *server; --- 784,790 ---- /* Things which are per connection */ ! struct afs_conn_rec { ap_pool *pool; server_rec *server; Index: openafs/src/aklog/.gitignore diff -c /dev/null openafs/src/aklog/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/aklog/.gitignore Mon Jun 15 18:37:29 2009 *************** *** 0 **** --- 1,7 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /aklog + /asetkey + /klog Index: openafs/src/auth/.gitignore diff -c /dev/null openafs/src/auth/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/auth/.gitignore Mon Jun 15 18:37:29 2009 *************** *** 0 **** --- 1,10 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /acfg_errors.c + /auth.h + /cellconfig.h + /copyauth + /ktc_errors.c + /setkey Index: openafs/src/bozo/.gitignore diff -c /dev/null openafs/src/bozo/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/bozo/.gitignore Mon Jun 15 18:37:29 2009 *************** *** 0 **** --- 1,10 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /bnode.h + /bos + /bos_util + /boserr.c + /bosint.h + /bosserver Index: openafs/src/bu_utils/.gitignore diff -c /dev/null openafs/src/bu_utils/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/bu_utils/.gitignore Mon Jun 15 18:37:29 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /fms Index: openafs/src/bubasics/.gitignore diff -c /dev/null openafs/src/bubasics/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/bubasics/.gitignore Mon Jun 15 18:37:29 2009 *************** *** 0 **** --- 1,12 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /bumon.h + /butc.h + /butc_errs.c + /butm.h + /butm_errs.c + /butx.h + /butx_errs.c + /tcdata.h Index: openafs/src/bucoord/.gitignore diff -c /dev/null openafs/src/bucoord/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/bucoord/.gitignore Mon Jun 15 18:37:30 2009 *************** *** 0 **** --- 1,7 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /backup + /bc.h + /bucoord_errs.c Index: openafs/src/budb/.gitignore diff -c /dev/null openafs/src/budb/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/budb/.gitignore Mon Jun 15 18:37:30 2009 *************** *** 0 **** --- 1,9 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /budb.h + /budb_client.h + /budb_errs.c + /budb_errs.h + /budb_server Index: openafs/src/butc/.gitignore diff -c /dev/null openafs/src/butc/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/butc/.gitignore Mon Jun 15 18:37:30 2009 *************** *** 0 **** --- 1,6 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /butc + /read_tape Index: openafs/src/cf/solaris-solookup.m4 diff -c /dev/null openafs/src/cf/solaris-solookup.m4:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/cf/solaris-solookup.m4 Wed Jun 24 17:40:18 2009 *************** *** 0 **** --- 1,17 ---- + AC_DEFUN([SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS], [ + AC_MSG_CHECKING(whether solookup takes a sockparams) + AC_CACHE_VAL(ac_cv_solaris_solookup_takes_sockparams, + [ + AC_TRY_COMPILE( + [#define _KERNEL + #include + #include ], + [struct sockparams *sp; + (void) solookup(AF_INET, SOCK_DGRAM, 0, &sp);], + ac_cv_solaris_solookup_takes_sockparams=yes, + ac_cv_solaris_solookup_takes_sockparams=no)]) + AC_MSG_RESULT($ac_cv_solaris_solookup_takes_sockparams) + if test "$ac_cv_solaris_solookup_takes_sockparams" = "yes"; then + AC_DEFINE(SOLOOKUP_TAKES_SOCKPARAMS, 1, [define if solookup takes a sockparams**]) + fi + ]) Index: openafs/src/cmd/.gitignore diff -c /dev/null openafs/src/cmd/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/cmd/.gitignore Mon Jun 15 18:37:30 2009 *************** *** 0 **** --- 1,6 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /cmd.h + /cmd_errors.c Index: openafs/src/comerr/.gitignore diff -c /dev/null openafs/src/comerr/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/comerr/.gitignore Mon Jun 15 18:37:30 2009 *************** *** 0 **** --- 1,6 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /compile_et + /et_lex.lex.c Index: openafs/src/config/.gitignore diff -c /dev/null openafs/src/config/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/config/.gitignore Mon Jun 15 18:37:31 2009 *************** *** 0 **** --- 1,17 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /Makefile.*_*[0123456789] + /Makefile.*_*[0123456789].in + /Makefile.config + /Makefile.version + /Makefile.version-NOCML + /afsconfig.h + /afsconfig.h.in + /config + /mkvers + /param.h.new + /shlib-build + /shlib-install + /stamp-h1 Index: openafs/src/config/param.i386_fbsd_61.h diff -c openafs/src/config/param.i386_fbsd_61.h:1.1.6.2 openafs/src/config/param.i386_fbsd_61.h:1.1.6.3 *** openafs/src/config/param.i386_fbsd_61.h:1.1.6.2 Mon Jul 31 12:06:33 2006 --- openafs/src/config/param.i386_fbsd_61.h Wed Jun 24 17:45:14 2009 *************** *** 195,198 **** --- 195,204 ---- #endif /* !defined(UKERNEL) */ + /* general user-space compiles */ + + #if defined(UKERNEL) || !defined(KERNEL) + #define STDLIB_HAS_MALLOC_PROTOS 1 + #endif + #endif /* AFS_PARAM_H */ Index: openafs/src/des/.gitignore diff -c /dev/null openafs/src/des/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/des/.gitignore Mon Jun 15 18:37:31 2009 *************** *** 0 **** --- 1,18 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /fp.c + /ip.c + /key_perm.h + /make_fp + /make_ip + /make_keyperm + /make_odd + /make_p + /make_p_table + /make_s_table + /odd.h + /p.c + /p_table.h + /s_table.h Index: openafs/src/dir/test/.gitignore diff -c /dev/null openafs/src/dir/test/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/dir/test/.gitignore Mon Jun 15 18:37:31 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /dtest Index: openafs/src/export/.gitignore diff -c /dev/null openafs/src/export/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/export/.gitignore Mon Jun 15 18:37:31 2009 *************** *** 0 **** --- 1,8 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /cfgafs64 + /cfgexport64 + /export.ext.nonfs + /export64.ext.nonfs Index: openafs/src/finale/.gitignore diff -c /dev/null openafs/src/finale/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/finale/.gitignore Mon Jun 15 18:37:31 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /translate_et Index: openafs/src/fsint/.gitignore diff -c /dev/null openafs/src/fsint/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/fsint/.gitignore Mon Jun 15 18:37:32 2009 *************** *** 0 **** --- 1,10 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /Kcallback.h + /Kvice.h + /Kpagcb.h + /afscbint.h + /afsint.h + /pagcb.h Index: openafs/src/fsprobe/.gitignore diff -c /dev/null openafs/src/fsprobe/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/fsprobe/.gitignore Mon Jun 15 18:37:32 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /fsprobe_test Index: openafs/src/gtx/.gitignore diff -c /dev/null openafs/src/gtx/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/gtx/.gitignore Mon Jun 15 18:37:33 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /gtxtest Index: openafs/src/kauth/.gitignore diff -c /dev/null openafs/src/kauth/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/kauth/.gitignore Mon Jun 15 18:37:33 2009 *************** *** 0 **** --- 1,20 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /Kkauth.h + /ka-forwarder + /kaerrors.c + /kas + /kaserver + /kauth.h + /kautils.h + /kdb + /klog + /klog.krb + /klogin + /klogin.krb + /knfs + /kpasswd + /kpwvalid + /rebuild Index: openafs/src/kopenafs/.gitignore diff -c /dev/null openafs/src/kopenafs/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/kopenafs/.gitignore Mon Jun 15 18:37:33 2009 *************** *** 0 **** --- 1,6 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /test-setpag + /test-unlog Index: openafs/src/libadmin/adminutil/.gitignore diff -c /dev/null openafs/src/libadmin/adminutil/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/libadmin/adminutil/.gitignore Mon Jun 15 18:37:33 2009 *************** *** 0 **** --- 1,22 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /afs_AdminBosErrors.c + /afs_AdminBosErrors.h + /afs_AdminCfgErrors.c + /afs_AdminCfgErrors.h + /afs_AdminClientErrors.c + /afs_AdminClientErrors.h + /afs_AdminCommonErrors.c + /afs_AdminCommonErrors.h + /afs_AdminKasErrors.c + /afs_AdminKasErrors.h + /afs_AdminMiscErrors.c + /afs_AdminMiscErrors.h + /afs_AdminPtsErrors.c + /afs_AdminPtsErrors.h + /afs_AdminUtilErrors.c + /afs_AdminUtilErrors.h + /afs_AdminVosErrors.c + /afs_AdminVosErrors.h Index: openafs/src/libadmin/samples/.gitignore diff -c /dev/null openafs/src/libadmin/samples/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/libadmin/samples/.gitignore Mon Jun 15 18:37:33 2009 *************** *** 0 **** --- 1,25 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /cm_client_config + /cm_list_cells + /cm_local_cell + /cm_server_prefs + /rxdebug_basic_stats + /rxdebug_conns + /rxdebug_peers + /rxdebug_rx_stats + /rxdebug_supported_stats + /rxdebug_version + /rxstat_clear_peer + /rxstat_clear_process + /rxstat_disable_peer + /rxstat_disable_process + /rxstat_enable_peer + /rxstat_enable_process + /rxstat_get_peer + /rxstat_get_process + /rxstat_get_version + /rxstat_query_peer + /rxstat_query_process Index: openafs/src/libadmin/test/.gitignore diff -c /dev/null openafs/src/libadmin/test/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/libadmin/test/.gitignore Mon Jun 15 18:37:34 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /afscp Index: openafs/src/libafs/.gitignore diff -c /dev/null openafs/src/libafs/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/libafs/.gitignore Mon Jun 15 18:37:34 2009 *************** *** 0 **** --- 1,26 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /MODLOAD + /MODLOAD-* + /MODLOAD32 + /MODLOAD64 + /Makefile.common + /MakefileProto.* + !/MakefileProto.*.in + /afs + /afsint + /asm + /asm-generic + /config + /export.h + /export.exp + /export64.exp + /h + /linux + /net + /netinet + /rpc + /sys + /rx Index: openafs/src/libuafs/.gitignore diff -c /dev/null openafs/src/libuafs/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/libuafs/.gitignore Mon Jun 15 18:37:34 2009 *************** *** 0 **** --- 1,27 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /Makefile.common + /MakefileProto.* + !/MakefileProto.*.in + /UAFS + /JUAFS + /afs + /afsint + /config + /des + /h + /inet + /linktest + /net + /netinet + /nfs + /nsapi + /rpc + /rx + /sys + /ufs + /export.exp + /export.h + /export64.exp Index: openafs/src/log/.gitignore diff -c /dev/null openafs/src/log/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/log/.gitignore Mon Jun 15 18:37:34 2009 *************** *** 0 **** --- 1,8 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /kseal + /tokens + /tokens.krb + /unlog Index: openafs/src/packaging/Debian/.gitignore diff -c /dev/null openafs/src/packaging/Debian/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/packaging/Debian/.gitignore Mon Jun 15 18:37:35 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /rules Index: openafs/src/packaging/MacOS/.gitignore diff -c /dev/null openafs/src/packaging/MacOS/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/packaging/MacOS/.gitignore Mon Jun 15 18:37:35 2009 *************** *** 0 **** --- 1,9 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /OpenAFS.Info.plist + /OpenAFS.info + /buildpkg.sh + + !/Makefile Index: openafs/src/packaging/RedHat/.gitignore diff -c /dev/null openafs/src/packaging/RedHat/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/packaging/RedHat/.gitignore Mon Jun 15 18:37:35 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /openafs.spec Index: openafs/src/pam/.gitignore diff -c /dev/null openafs/src/pam/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/pam/.gitignore Mon Jun 15 18:37:35 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /test_pam Index: openafs/src/platform/SOLARIS/.gitignore diff -c /dev/null openafs/src/platform/SOLARIS/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/platform/SOLARIS/.gitignore Mon Jun 15 18:37:35 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /fs_conv_sol26 Index: openafs/src/ptserver/.gitignore diff -c /dev/null openafs/src/ptserver/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/ptserver/.gitignore Mon Jun 15 18:37:36 2009 *************** *** 0 **** --- 1,16 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /Kptint.h + /db_verify + /pt_util + /pterror.c + /pterror.h + /ptint.h + /pts + /ptserver + /readgroup + /readpwd + /testpt + /ptclient Index: openafs/src/rx/.gitignore diff -c /dev/null openafs/src/rx/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/rx/.gitignore Mon Jun 15 18:37:36 2009 *************** *** 0 **** --- 1,7 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /rxdebug + /rxdumptrace + /rxperf Index: openafs/src/rx/SOLARIS/rx_knet.c diff -c openafs/src/rx/SOLARIS/rx_knet.c:1.19.2.5 openafs/src/rx/SOLARIS/rx_knet.c:1.19.2.6 *** openafs/src/rx/SOLARIS/rx_knet.c:1.19.2.5 Mon Jul 7 13:15:37 2008 --- openafs/src/rx/SOLARIS/rx_knet.c Wed Jun 24 17:38:42 2009 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/rx/SOLARIS/rx_knet.c,v 1.19.2.5 2008/07/07 17:15:37 shadow Exp $"); #ifdef AFS_SUN5_ENV #include "rx/rx_kcommon.h" --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/rx/SOLARIS/rx_knet.c,v 1.19.2.6 2009/06/24 21:38:42 shadow Exp $"); #ifdef AFS_SUN5_ENV #include "rx/rx_kcommon.h" *************** *** 50,59 **** --- 50,66 ---- /* * Function pointers for kernel socket routines */ + #ifdef SOLOOKUP_TAKES_SOCKPARAMS + struct sonode *(*sockfs_socreate) + (struct sockparams *, int, int, int, int, int *) = NULL; + int (*sockfs_solookup) + (int, int, int, struct sockparams **) = NULL; + #else struct sonode *(*sockfs_socreate) (vnode_t *, int, int, int, int, struct sonode *, int *) = NULL; struct vnode *(*sockfs_solookup) (int, int, int, char *, int *) = NULL; + #endif /* SOLOOKUP_TAKES_SOCKPARAMS */ int (*sockfs_sobind) (struct sonode *, struct sockaddr *, int, int, int) = NULL; int (*sockfs_sorecvmsg) *************** *** 327,338 **** --- 334,352 ---- struct sockaddr_in addr; int error; int len; + #ifdef SOLOOKUP_TAKES_SOCKPARAMS + struct sockparams *sp; + #endif AFS_STATCNT(osi_NewSocket); if (sockfs_solookup == NULL) { sockfs_solookup = + #ifdef SOLOOKUP_TAKES_SOCKPARAMS + (int (*)())modlookup("sockfs", "solookup"); + #else (struct vnode * (*)())modlookup("sockfs", "solookup"); + #endif if (sockfs_solookup == NULL) { return NULL; } *************** *** 381,386 **** --- 395,408 ---- } #endif + #ifdef SOLOOKUP_TAKES_SOCKPARAMS + error = sockfs_solookup(AF_INET, SOCK_DGRAM, 0, &sp); + if (error != 0) { + return NULL; + } + + so = sockfs_socreate(sp, AF_INET, SOCK_DGRAM, 0, SOV_STREAM, &error); + #else accessvp = sockfs_solookup(AF_INET, SOCK_DGRAM, 0, "/dev/udp", &error); if (accessvp == NULL) { return NULL; *************** *** 388,393 **** --- 410,417 ---- so = sockfs_socreate(accessvp, AF_INET, SOCK_DGRAM, 0, SOV_STREAM, NULL, &error); + #endif /* SOLOOKUP_TAKES_SOCKPARAMS */ + if (so == NULL) { return NULL; } *************** *** 423,429 **** } int ! osi_FreeSocket(register osi_socket *asocket) { extern int rxk_ListenerPid; struct sonode *so = (struct sonode *)asocket; --- 447,453 ---- } int ! osi_FreeSocket(register osi_socket asocket) { extern int rxk_ListenerPid; struct sonode *so = (struct sonode *)asocket; Index: openafs/src/rxdebug/.gitignore diff -c /dev/null openafs/src/rxdebug/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/rxdebug/.gitignore Mon Jun 15 18:37:36 2009 *************** *** 0 **** --- 1,6 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /rxdebug + /rxdumptrace Index: openafs/src/rxgen/.gitignore diff -c /dev/null openafs/src/rxgen/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/rxgen/.gitignore Mon Jun 15 18:37:36 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /rxgen Index: openafs/src/rxkad/.gitignore diff -c /dev/null openafs/src/rxkad/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/rxkad/.gitignore Mon Jun 15 18:37:36 2009 *************** *** 0 **** --- 1,11 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /crypt_conn.c + /fcrypt.c + /fcrypt.h + /rxkad.h + /rxkad_errs.c + /sboxes.h + /fc_test Index: openafs/src/rxstat/.gitignore diff -c /dev/null openafs/src/rxstat/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/rxstat/.gitignore Mon Jun 15 18:37:37 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /rxstat.h Index: openafs/src/scout/.gitignore diff -c /dev/null openafs/src/scout/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/scout/.gitignore Mon Jun 15 18:37:37 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /scout Index: openafs/src/sys/.gitignore diff -c /dev/null openafs/src/sys/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/sys/.gitignore Mon Jun 15 18:37:38 2009 *************** *** 0 **** --- 1,12 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /pagsh + /pagsh.krb + /picobj + /rmtsys.h + /rmtsysd + /afs.exp + /afsl.exp + /Krmtsys.h Index: openafs/src/tbudb/.gitignore diff -c /dev/null openafs/src/tbudb/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/tbudb/.gitignore Mon Jun 15 18:37:38 2009 *************** *** 0 **** --- 1,9 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /budb.h + /budb_client.h + /budb_errs.c + /budb_errs.h + /budb_server Index: openafs/src/tbutc/.gitignore diff -c /dev/null openafs/src/tbutc/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/tbutc/.gitignore Mon Jun 15 18:37:39 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /butc Index: openafs/src/tests/.gitignore diff -c /dev/null openafs/src/tests/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:04 2009 --- openafs/src/tests/.gitignore Mon Jun 15 18:37:39 2009 *************** *** 0 **** --- 1,74 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /xf_errs.c + /xf_errs.h + /OS.pm + /Dirpath.pm + /afsdump_dirlist + /afsdump_extract + /afsdump_scan + /append-over-page + /asu + /blocks-new-file + /create-dirs + /create-files + /create-remove + /create-stat + /create-symlinks + /dumpscan_errs.c + /dumpscan_errs.h + /dumptool + /dup2-and-unlog + /echo-n + /exit-wo-close + /fchmod + /fsx + /hardlink1 + /hardlink2 + /hardlink4 + /hello-world + /intr-read + /kill-softer + /kill-softly + /large-dir + /large-dir2 + /large-dir3 + /make-page + /mkdir2 + /mkdir3 + /mmap-and-read + /mmap-cat + /mmap-shared-write + /mmap-vs-read + /mmap-vs-read2 + /mountpoint + /pine + /read-vs-mmap + /read-vs-mmap2 + /read-write + /readdir-vs-lstat + /rename-under-feet + /rename5 + /rename6 + /rm-rf + /run-tests + /still-there-p + /strange-characters-c + /symlink + /test-parallel1 + /test-parallel2 + /test-setgroups + /test-setpag + /truncate + /truncate-files + /utime-dir + /utime-file + /write-closed + /write-closed2 + /write-large + /write-rand + /write-ro-file + /write-ucc + /write3 Index: openafs/src/tests/OpenAFS/.gitignore diff -c /dev/null openafs/src/tests/OpenAFS/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/tests/OpenAFS/.gitignore Mon Jun 15 18:37:39 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /Dirpath.pm Index: openafs/src/tools/install/.gitignore diff -c /dev/null openafs/src/tools/install/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/tools/install/.gitignore Mon Jun 15 18:37:40 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + !.afs_state Index: openafs/src/tptserver/.gitignore diff -c /dev/null openafs/src/tptserver/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/tptserver/.gitignore Mon Jun 15 18:37:40 2009 *************** *** 0 **** --- 1,14 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /db_verify + /pt_util + /pterror.c + /pterror.h + /ptint.h + /pts + /ptserver + /readgroup + /readpwd + /testpt Index: openafs/src/tsalvaged/.gitignore diff -c /dev/null openafs/src/tsalvaged/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/tsalvaged/.gitignore Mon Jun 15 18:37:40 2009 *************** *** 0 **** --- 1,7 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /fssync-debug + /salvageserver + /salvsync-debug Index: openafs/src/tubik/.gitignore diff -c /dev/null openafs/src/tubik/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/tubik/.gitignore Mon Jun 15 18:37:40 2009 *************** *** 0 **** --- 1,11 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /ubik.h + /ubik_int.h + /udebug + /uerrors.c + /utst_client + /utst_int.h + /utst_server Index: openafs/src/tviced/.gitignore diff -c /dev/null openafs/src/tviced/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/tviced/.gitignore Mon Jun 15 18:37:40 2009 *************** *** 0 **** --- 1,6 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /fileserver + /state_analyzer Index: openafs/src/tvlserver/.gitignore diff -c /dev/null openafs/src/tvlserver/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/tvlserver/.gitignore Mon Jun 15 18:37:41 2009 *************** *** 0 **** --- 1,11 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /cnvldb + /vl_errors.c + /vlclient + /vldb_check + /vldbint.h + /vlserver + /vlserver.h Index: openafs/src/tvolser/.gitignore diff -c /dev/null openafs/src/tvolser/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/tvolser/.gitignore Mon Jun 15 18:37:41 2009 *************** *** 0 **** --- 1,8 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /vl_errors.c + /vlserver.h + /volserver + /vos Index: openafs/src/ubik/.gitignore diff -c /dev/null openafs/src/ubik/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/ubik/.gitignore Mon Jun 15 18:37:41 2009 *************** *** 0 **** --- 1,12 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /Kubik_int.h + /ubik.h + /ubik_int.h + /udebug + /uerrors.c + /utst_client + /utst_int.h + /utst_server Index: openafs/src/update/.gitignore diff -c /dev/null openafs/src/update/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/update/.gitignore Mon Jun 15 18:37:41 2009 *************** *** 0 **** --- 1,7 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /upclient + /update.h + /upserver Index: openafs/src/uss/.gitignore diff -c /dev/null openafs/src/uss/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/uss/.gitignore Mon Jun 15 18:37:41 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /uss Index: openafs/src/util/.gitignore diff -c /dev/null openafs/src/util/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/util/.gitignore Mon Jun 15 18:37:42 2009 *************** *** 0 **** --- 1,6 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /dirpath.h + /sys Index: openafs/src/venus/.gitignore diff -c /dev/null openafs/src/venus/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/venus/.gitignore Mon Jun 15 18:37:42 2009 *************** *** 0 **** --- 1,12 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /cmdebug + /fs + /fstrace + /kdump-* + /up + /kdump + /kdump64 + /livesys Index: openafs/src/venus/kdump.c diff -c openafs/src/venus/kdump.c:1.33.2.9 openafs/src/venus/kdump.c:1.33.2.10 *** openafs/src/venus/kdump.c:1.33.2.9 Fri Oct 3 16:40:05 2008 --- openafs/src/venus/kdump.c Wed Jun 24 17:30:20 2009 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/venus/kdump.c,v 1.33.2.9 2008/10/03 20:40:05 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/venus/kdump.c,v 1.33.2.10 2009/06/24 21:30:20 shadow Exp $"); #include #include *************** *** 2005,2014 **** 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)); T += j; printf("%20s:\t%8d bytes\t[%d conns/%d bytes each]\n", ! "Connection package", j, Nconns, sizeof(struct conn)); i = (AFS_NCBRS * sizeof(struct afs_cbr)) * (j = afs_cmperfstats. --- 2005,2014 ---- 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 afs_conn)); T += j; printf("%20s:\t%8d bytes\t[%d conns/%d bytes each]\n", ! "Connection package", j, Nconns, sizeof(struct afs_conn)); i = (AFS_NCBRS * sizeof(struct afs_cbr)) * (j = afs_cmperfstats. *************** *** 2669,2680 **** print_conns(kmem, srv, conns, Con, pnt) int kmem, Con, pnt; struct srvAddr *srv; ! struct conn *conns; { ! struct conn *cep, ce, *centry = &ce; int i = 1; ! cep = (struct conn *)conns; if (pnt && Con != 2) { if (cep) printf("\tRPC connections for server %lx:\n", srv); --- 2669,2680 ---- print_conns(kmem, srv, conns, Con, pnt) int kmem, Con, pnt; struct srvAddr *srv; ! struct afs_conn *conns; { ! struct afs_conn *cep, ce, *centry = &ce; int i = 1; ! cep = (struct afs_conn *)conns; if (pnt && Con != 2) { if (cep) printf("\tRPC connections for server %lx:\n", srv); *************** *** 2693,2699 **** void print_conn(kmem, conns, ptr, pnt) int kmem, pnt; ! struct conn *conns, *ptr; { if (!pnt) return; --- 2693,2699 ---- void print_conn(kmem, conns, ptr, pnt) int kmem, pnt; ! struct afs_conn *conns, *ptr; { if (!pnt) return; Index: openafs/src/venus/test/.gitignore diff -c /dev/null openafs/src/venus/test/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/venus/test/.gitignore Mon Jun 15 18:37:42 2009 *************** *** 0 **** --- 1,8 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /fulltest + /getinitparams + /idtest + /owntest Index: openafs/src/vfsck/.gitignore diff -c /dev/null openafs/src/vfsck/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/vfsck/.gitignore Mon Jun 15 18:37:42 2009 *************** *** 0 **** --- 1,5 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /vfsck Index: openafs/src/viced/.gitignore diff -c /dev/null openafs/src/viced/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/viced/.gitignore Mon Jun 15 18:37:42 2009 *************** *** 0 **** --- 1,8 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /cbd + /check_sysid + /fileserver + /fsprobe Index: openafs/src/vlserver/.gitignore diff -c /dev/null openafs/src/vlserver/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/vlserver/.gitignore Mon Jun 15 18:37:43 2009 *************** *** 0 **** --- 1,11 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /cnvldb + /vl_errors.c + /vlclient + /vldb_check + /vldbint.h + /vlserver + /vlserver.h Index: openafs/src/vol/.gitignore diff -c /dev/null openafs/src/vol/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/vol/.gitignore Mon Jun 15 18:37:43 2009 *************** *** 0 **** --- 1,9 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /salvager + /volinfo + /gi + /fs_conv_sol26 + /fssync-debug Index: openafs/src/vol/vnode.h diff -c openafs/src/vol/vnode.h:1.12.2.1 openafs/src/vol/vnode.h:1.12.2.2 *** openafs/src/vol/vnode.h:1.12.2.1 Thu Apr 28 01:03:39 2005 --- openafs/src/vol/vnode.h Thu Jun 11 15:40:29 2009 *************** *** 105,111 **** * backup purposes */ afs_int32 group; /* unix group */ afs_int32 vn_ino_hi; /* high part of 64 bit inode. */ ! bit32 reserved6; /* Missing: * archiving/migration * encryption key --- 105,111 ---- * backup purposes */ afs_int32 group; /* unix group */ afs_int32 vn_ino_hi; /* high part of 64 bit inode. */ ! bit32 vn_length_hi; /* high part of 64 bit length */ /* Missing: * archiving/migration * encryption key *************** *** 156,165 **** #define SIZEOF_SMALLVNODE (sizeof (struct Vnode)) #ifdef AFS_LARGEFILE_ENV ! #define VN_GET_LEN(N, V) FillInt64(N, (V)->disk.reserved6, (V)->disk.length) ! #define VNDISK_GET_LEN(N, V) FillInt64(N, (V)->reserved6, (V)->length) ! #define VN_SET_LEN(V, N) SplitInt64(N, (V)->disk.reserved6, (V)->disk.length) ! #define VNDISK_SET_LEN(V, N) SplitInt64(N, (V)->reserved6, (V)->length) #else /* !AFS_LARGEFILE_ENV */ #define VN_GET_LEN(N, V) (N) = (V)->disk.length; #define VNDISK_GET_LEN(N, V) (N) = (V)->length; --- 156,165 ---- #define SIZEOF_SMALLVNODE (sizeof (struct Vnode)) #ifdef AFS_LARGEFILE_ENV ! #define VN_GET_LEN(N, V) FillInt64(N, (V)->disk.vn_length_hi, (V)->disk.length) ! #define VNDISK_GET_LEN(N, V) FillInt64(N, (V)->vn_length_hi, (V)->length) ! #define VN_SET_LEN(V, N) SplitInt64(N, (V)->disk.vn_length_hi, (V)->disk.length) ! #define VNDISK_SET_LEN(V, N) SplitInt64(N, (V)->vn_length_hi, (V)->length) #else /* !AFS_LARGEFILE_ENV */ #define VN_GET_LEN(N, V) (N) = (V)->disk.length; #define VNDISK_GET_LEN(N, V) (N) = (V)->length; Index: openafs/src/volser/.gitignore diff -c /dev/null openafs/src/volser/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/volser/.gitignore Mon Jun 15 18:37:43 2009 *************** *** 0 **** --- 1,11 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /restorevol + /volerr.c + /volint.h + /volser.h + /volserver + /vos + /voldump Index: openafs/src/xstat/.gitignore diff -c /dev/null openafs/src/xstat/.gitignore:1.1.4.2 *** /dev/null Thu Jun 25 08:20:05 2009 --- openafs/src/xstat/.gitignore Mon Jun 15 18:37:44 2009 *************** *** 0 **** --- 1,6 ---- + # After changing this file, please run + # git ls-files -i --exclude-standard + # to check that you haven't inadvertently ignored any tracked files. + + /xstat_cm_test + /xstat_fs_test