/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
/*
* Implements:
*/
-#include "../afs/param.h" /* Should be always first */
#include <afsconfig.h>
+#include "afs/param.h"
-RCSID("$Header$");
-#include "../afs/stds.h"
-#include "../afs/sysincludes.h" /* Standard vendor system headers */
+#include "afs/stds.h"
+#include "afs/sysincludes.h" /* Standard vendor system headers */
#if !defined(UKERNEL)
+#if !defined(AFS_LINUX20_ENV)
#include <net/if.h>
+#endif
#include <netinet/in.h>
#ifdef AFS_SGI62_ENV
-#include "../h/hashing.h"
+#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV)
#include <netinet/in_var.h>
#endif /* ! AFS_HPUX110_ENV */
#endif /* !defined(UKERNEL) */
-#include "../afs/afsincludes.h" /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* afs statistics */
+#include "afsincludes.h" /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* afs statistics */
-#if defined(AFS_SUN56_ENV)
+#if defined(AFS_SUN5_ENV)
#include <inet/led.h>
#include <inet/common.h>
-#if defined(AFS_SUN58_ENV)
#include <netinet/ip6.h>
-#endif
#include <inet/ip.h>
#endif
-/* Imported variables */
-extern afs_rwlock_t afs_xserver;
-extern afs_rwlock_t afs_xsrvAddr;
-extern afs_rwlock_t afs_xconn;
-extern afs_rwlock_t afs_xvcache;
-extern struct srvAddr *afs_srvAddrs[NSERVERS]; /* Hashed by server's ip */
-extern struct server *afs_servers[NSERVERS];
-
/* Exported variables */
afs_rwlock_t afs_xuser;
struct unixuser *afs_users[NUSERS];
+#ifndef AFS_PAG_MANAGER
/* Forward declarations */
void afs_ResetAccessCache(afs_int32 uid, int alock);
-
-/*
- * Called with afs_xuser, afs_xserver and afs_xconn locks held, to delete
- * appropriate conn structures for au
- */
-static void RemoveUserConns(au)
- register struct unixuser *au;
-{
- 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++) {
- for (ts = afs_servers[i]; ts; ts=ts->next) {
- for (sa = ts->addr; sa; sa = sa->next_sa) {
- lc = &sa->conns;
- for (tc = *lc; tc; lc = &tc->next, tc = *lc) {
- if (tc->user == au && tc->refCount == 0) {
- *lc = tc->next;
- 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*/
- }
- } /*For each server on chain*/
- } /*For each chain*/
-
-} /*RemoveUserConns*/
+#endif /* !AFS_PAG_MANAGER */
/* Called from afs_Daemon to garbage collect unixusers no longer using system,
* other epochs as soon as possible (old file servers act bizarrely when they
* see epoch changes).
*/
-void afs_GCUserData(aforce) {
- register struct unixuser *tu, **lu, *nu;
- register int i;
+void
+afs_GCUserData(int aforce)
+{
+ struct unixuser *tu, **lu, *nu;
+ int i;
afs_int32 now, delFlag;
AFS_STATCNT(afs_GCUserData);
/* Obtain locks in valid order */
- ObtainWriteLock(&afs_xuser,95);
+ ObtainWriteLock(&afs_xuser, 95);
+#ifndef AFS_PAG_MANAGER
ObtainReadLock(&afs_xserver);
- ObtainWriteLock(&afs_xconn,96);
+ ObtainWriteLock(&afs_xconn, 96);
+#endif
now = osi_Time();
- for (i=0;i<NUSERS;i++) {
+ for (i = 0; i < NUSERS; i++) {
for (lu = &afs_users[i], tu = *lu; tu; tu = nu) {
delFlag = 0; /* should we delete this dude? */
/* Don't garbage collect users in use now (refCount) */
if (tu->refCount == 0) {
- if (tu->states & UHasTokens) {
- /*
- * Give ourselves a little extra slack, in case we
- * reauthenticate
- */
- if (tu->ct.EndTimestamp < now - NOTOKTIMEOUT)
+ if (tu->tokens) {
+ /* Need to walk the token stack, and dispose of
+ * all expired tokens */
+ afs_DiscardExpiredTokens(&tu->tokens, now);
+ if (!afs_HasUsableTokens(tu->tokens, now))
delFlag = 1;
- }
- else {
+ } else {
if (aforce || (tu->tokenTime < now - NOTOKTIMEOUT))
delFlag = 1;
}
nu = tu->next;
if (delFlag) {
*lu = tu->next;
- RemoveUserConns(tu);
- if (tu->stp)
- afs_osi_Free(tu->stp, tu->stLen);
+#ifndef AFS_PAG_MANAGER
+ afs_ReleaseConnsUser(tu);
+#endif
+ afs_FreeTokens(&tu->tokens);
+
if (tu->exporter)
EXP_RELE(tu->exporter);
afs_osi_Free(tu, sizeof(struct unixuser));
- }
- else {
+ } else {
lu = &tu->next;
}
}
}
+#ifndef AFS_PAG_MANAGER
ReleaseWriteLock(&afs_xconn);
- ReleaseWriteLock(&afs_xuser);
+#endif
+#ifndef AFS_PAG_MANAGER
ReleaseReadLock(&afs_xserver);
+#endif
+ ReleaseWriteLock(&afs_xuser);
-} /*afs_GCUserData*/
+} /*afs_GCUserData */
+#ifndef AFS_PAG_MANAGER
/*
* Check for unixusers who encountered bad tokens, and reset the access
* cache for these guys. Can't do this when token expiration detected,
* since too many locks are set then.
*/
-void afs_CheckTokenCache()
-
+void
+afs_CheckTokenCache(void)
{
- register int i;
- register struct unixuser *tu;
+ int i;
+ struct unixuser *tu;
afs_int32 now;
- register struct cell *tcell;
AFS_STATCNT(afs_CheckCacheResets);
ObtainReadLock(&afs_xvcache);
ObtainReadLock(&afs_xuser);
now = osi_Time();
- for (i=0;i<NUSERS;i++) {
- for (tu=afs_users[i]; tu; tu=tu->next) {
- register afs_int32 uid;
+ for (i = 0; i < NUSERS; i++) {
+ for (tu = afs_users[i]; tu; tu = tu->next) {
+ afs_int32 uid;
/*
* If tokens are still good and user has Kerberos tickets,
* check expiration
*/
- if (!(tu->states & UTokensBad) && tu->vid != UNDEFVID) {
- if (tu->ct.EndTimestamp < now) {
+ if ((tu->states & UHasTokens) && !(tu->states & UTokensBad)) {
+ if (!afs_HasUsableTokens(tu->tokens, now)) {
/*
* This token has expired, warn users and reset access
* cache.
*/
-#ifdef notdef
- tcell = afs_GetCell(tu->cell);
- /* I really hate this message - MLK */
- afs_warn("afs: Tokens for user of AFS id %d for cell %s expired now\n",
- tu->vid, tcell->cellName);
-#endif
tu->states |= (UTokensBad | UNeedsReset);
}
}
}
ReleaseReadLock(&afs_xuser);
ReleaseReadLock(&afs_xvcache);
+} /*afs_CheckTokenCache */
-} /*afs_CheckTokenCache*/
-
-void afs_ResetAccessCache(afs_int32 uid, int alock)
+void
+afs_ResetAccessCache(afs_int32 uid, int alock)
{
- register int i, j;
- register struct vcache *tvc;
+ int i;
+ struct vcache *tvc;
struct axscache *ac;
AFS_STATCNT(afs_ResetAccessCache);
if (alock)
ObtainReadLock(&afs_xvcache);
- for(i=0;i<VCSIZE;i++) {
- for(tvc=afs_vhashT[i]; tvc; tvc=tvc->hnext) {
- /* really should do this under cache write lock, but that.
- is hard to under locking hierarchy */
- if (tvc->Access && (ac = afs_FindAxs(tvc->Access, uid))) {
- afs_RemoveAxs (&tvc->Access, ac);
- }
+ for (i = 0; i < VCSIZE; i++) {
+ for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
+ /* really should do this under cache write lock, but that.
+ * is hard to under locking hierarchy */
+ if (tvc->Access && (ac = afs_FindAxs(tvc->Access, uid))) {
+ afs_RemoveAxs(&tvc->Access, ac);
+ }
}
}
if (alock)
ReleaseReadLock(&afs_xvcache);
-} /*afs_ResetAccessCache*/
+} /*afs_ResetAccessCache */
/*
* Ensure all connections make use of new tokens. Discard incorrectly-cached
* access info.
*/
-void afs_ResetUserConns (auser)
- register struct unixuser *auser;
-
+void
+afs_ResetUserConns(struct unixuser *auser)
{
- int i;
- struct server *ts;
+ int i, j;
struct srvAddr *sa;
- struct conn *tc;
-
+ struct sa_conn_vector *tcv;
+
AFS_STATCNT(afs_ResetUserConns);
ObtainReadLock(&afs_xsrvAddr);
- ObtainWriteLock(&afs_xconn,98);
-
- for (i=0;i<NSERVERS;i++) {
- for (sa = afs_srvAddrs[i]; sa; sa=sa->next_bkt) {
- for (tc = sa->conns; tc; tc=tc->next) {
- if (tc->user == auser) {
- tc->forceConnectFS = 1;
+ ObtainWriteLock(&afs_xconn, 98);
+
+ for (i = 0; i < NSERVERS; i++) {
+ for (sa = afs_srvAddrs[i]; sa; sa = sa->next_bkt) {
+ for (tcv = sa->conns; tcv; tcv = tcv->next) {
+ if (tcv->user == auser) {
+ for(j = 0; j < CVEC_LEN; ++j) {
+ (tcv->cvec[j]).forceConnectFS = 1;
}
}
+ }
}
}
ReleaseReadLock(&afs_xsrvAddr);
afs_ResetAccessCache(auser->uid, 1);
auser->states &= ~UNeedsReset;
-} /*afs_ResetUserConns*/
+} /*afs_ResetUserConns */
+#endif /* !AFS_PAG_MANAGER */
-struct unixuser *afs_FindUser(afs_int32 auid, afs_int32 acell, afs_int32 locktype)
+struct unixuser *
+afs_FindUser(afs_int32 auid, afs_int32 acell, afs_int32 locktype)
{
- register struct unixuser *tu;
- register afs_int32 i;
+ struct unixuser *tu;
+ afs_int32 i;
AFS_STATCNT(afs_FindUser);
i = UHash(auid);
- ObtainWriteLock(&afs_xuser,99);
- for(tu = afs_users[i]; tu; tu = tu->next) {
+ ObtainWriteLock(&afs_xuser, 99);
+ for (tu = afs_users[i]; tu; tu = tu->next) {
if (tu->uid == auid && ((tu->cell == acell) || (acell == -1))) {
tu->refCount++;
ReleaseWriteLock(&afs_xuser);
+ afs_LockUser(tu, locktype, 365);
return tu;
}
}
ReleaseWriteLock(&afs_xuser);
- return (struct unixuser *) 0;
+ return NULL;
-} /*afs_FindUser*/
+} /*afs_FindUser */
/*------------------------------------------------------------------------
* As advertised.
*------------------------------------------------------------------------*/
-void afs_ComputePAGStats()
-
-{ /*afs_ComputePAGStats*/
-
- register struct unixuser *currPAGP; /*Ptr to curr PAG*/
- register struct unixuser *cmpPAGP; /*Ptr to PAG being compared*/
- register struct afs_stats_AuthentInfo *authP; /*Ptr to stats area*/
- int curr_Record; /*Curr record */
- int currChain; /*Curr hash chain*/
- int currChainLen; /*Length of curr hash chain*/
- int currPAGRecords; /*# records in curr PAG*/
+void
+afs_ComputePAGStats(void)
+{
+ struct unixuser *currPAGP; /*Ptr to curr PAG */
+ struct unixuser *cmpPAGP; /*Ptr to PAG being compared */
+ struct afs_stats_AuthentInfo *authP; /*Ptr to stats area */
+ int curr_Record; /*Curr record */
+ int currChain; /*Curr hash chain */
+ int currChainLen; /*Length of curr hash chain */
+ int currPAGRecords; /*# records in curr PAG */
/*
* Lock out everyone else from scribbling on the PAG entries.
*/
curr_Record = 0;
authP = &(afs_stats_cmfullperf.authent);
- authP->curr_PAGs = 0;
- authP->curr_Records = 0;
- authP->curr_AuthRecords = 0;
- authP->curr_UnauthRecords = 0;
- authP->curr_MaxRecordsInPAG = 0;
- authP->curr_LongestChain = 0;
+ authP->curr_PAGs = 0;
+ authP->curr_Records = 0;
+ authP->curr_AuthRecords = 0;
+ authP->curr_UnauthRecords = 0;
+ authP->curr_MaxRecordsInPAG = 0;
+ authP->curr_LongestChain = 0;
for (currChain = 0; currChain < NUSERS; currChain++) {
currChainLen = 0;
for (currPAGP = afs_users[currChain]; currPAGP;
- currPAGP = currPAGP->next)
- {
+ currPAGP = currPAGP->next) {
/*
* Bump the number of records on this current chain, along with
* the total number of records in existence.
* We've found a previously-uncounted PAG. If it's been deleted
* but just not garbage-collected yet, we step over it.
*/
- if (currPAGP->vid == UNDEFVID)
+ if (!(currPAGP->states & UHasTokens))
continue;
/*
* If this PAG record has already been ``counted', namely
* associated with a PAG and tallied, clear its bit and move on.
*/
- (authP->curr_Records)++;
+ (authP->curr_Records)++;
if (currPAGP->states & UPAGCounted) {
currPAGP->states &= ~UPAGCounted;
continue;
- } /*We've counted this one already*/
+ }
+ /*We've counted this one already */
/*
* Jot initial info down, then sweep down the rest of the hash
* chain, looking for matching PAG entries. Note: to properly
*/
cmpPAGP->states |= UPAGCounted;
currPAGRecords++;
- if ((cmpPAGP->states & UHasTokens) &&
- !(cmpPAGP->states & UTokensBad))
+ if ((cmpPAGP->states & UHasTokens)
+ && !(cmpPAGP->states & UTokensBad))
(authP->curr_AuthRecords)++;
else
(authP->curr_UnauthRecords)++;
- } /*Records belong to same PAG*/
- } /*Compare to rest of PAG records in chain*/
+ } /*Records belong to same PAG */
+ } /*Compare to rest of PAG records in chain */
/*
* In the above comparisons, the current PAG record has been
if (currPAGRecords > authP->HWM_MaxRecordsInPAG)
authP->HWM_MaxRecordsInPAG = currPAGRecords;
}
- } /*Sweep a hash chain*/
+ } /*Sweep a hash chain */
/*
* If the chain we just finished zipping through is the longest we've
authP->HWM_LongestChain = currChainLen;
}
- } /*For each hash chain in afs_user*/
+ } /*For each hash chain in afs_user */
/*
* Now that we've counted everything up, we can consider all-time
*/
ReleaseReadLock(&afs_xuser);
-} /*afs_ComputePAGStats*/
+} /*afs_ComputePAGStats */
-struct unixuser *afs_GetUser(auid, acell, locktype)
- afs_int32 acell;
- register afs_int32 auid;
- afs_int32 locktype;
+struct unixuser *
+afs_GetUser(afs_int32 auid, afs_int32 acell, afs_int32 locktype)
{
- register struct unixuser *tu, *pu=0;
- register afs_int32 i;
- register afs_int32 RmtUser = 0;
+ struct unixuser *tu, *pu = 0;
+ afs_int32 i;
+ afs_int32 RmtUser = 0;
AFS_STATCNT(afs_GetUser);
i = UHash(auid);
- ObtainWriteLock(&afs_xuser,104);
+ ObtainWriteLock(&afs_xuser, 104);
for (tu = afs_users[i]; tu; tu = tu->next) {
if (tu->uid == auid) {
RmtUser = 0;
- pu = (struct unixuser *)0;
+ pu = NULL;
if (tu->exporter) {
RmtUser = 1;
pu = tu;
/* Here we setup the real cell for the client */
tu->cell = acell;
tu->refCount++;
- ReleaseWriteLock(&afs_xuser);
- return tu;
- } else
- if (tu->cell == acell || acell == -1) {
- tu->refCount++;
- ReleaseWriteLock(&afs_xuser);
- return tu;
- }
+ goto done;
+ } else if (tu->cell == acell || acell == -1) {
+ tu->refCount++;
+ goto done;
+ }
}
}
- tu = (struct unixuser *) afs_osi_Alloc(sizeof(struct unixuser));
+ tu = afs_osi_Alloc(sizeof(struct unixuser));
+ osi_Assert(tu != NULL);
#ifndef AFS_NOSTATS
afs_stats_cmfullperf.authent.PAGCreations++;
#endif /* AFS_NOSTATS */
- bzero((char *)tu, sizeof(struct unixuser));
+ memset(tu, 0, sizeof(struct unixuser));
+ AFS_RWLOCK_INIT(&tu->lock, "unixuser lock");
tu->next = afs_users[i];
afs_users[i] = tu;
if (RmtUser) {
* we simply rerecord relevant information from the original
* structure
*/
- if (pu && pu->exporter) {
- (void) EXP_HOLD(tu->exporter = pu->exporter);
+ if (pu && pu->exporter) {
+ tu->exporter = pu->exporter;
+ (void)EXP_HOLD(tu->exporter);
}
}
tu->uid = auid;
tu->cell = acell;
- tu->vid = UNDEFVID;
+ tu->viceId = UNDEFVID;
tu->refCount = 1;
tu->tokenTime = osi_Time();
+
+ done:
ReleaseWriteLock(&afs_xuser);
+ afs_LockUser(tu, locktype, 364);
return tu;
-} /*afs_GetUser*/
+} /*afs_GetUser */
+void
+afs_LockUser(struct unixuser *au, afs_int32 locktype,
+ unsigned int src_indicator)
+{
+ switch (locktype) {
+ case READ_LOCK:
+ ObtainReadLock(&au->lock);
+ break;
+ case WRITE_LOCK:
+ ObtainWriteLock(&au->lock, src_indicator);
+ break;
+ case SHARED_LOCK:
+ ObtainSharedLock(&au->lock, src_indicator);
+ break;
+ default:
+ /* noop */
+ break;
+ }
+}
-void afs_PutUser(au, locktype)
- register struct unixuser *au;
- afs_int32 locktype;
+void
+afs_PutUser(struct unixuser *au, afs_int32 locktype)
{
AFS_STATCNT(afs_PutUser);
+
+ switch (locktype) {
+ case READ_LOCK:
+ ReleaseReadLock(&au->lock);
+ break;
+ case WRITE_LOCK:
+ ReleaseWriteLock(&au->lock);
+ break;
+ case SHARED_LOCK:
+ ReleaseSharedLock(&au->lock);
+ break;
+ default:
+ /* noop */
+ break;
+ }
+
--au->refCount;
-} /*afs_PutUser*/
+} /*afs_PutUser */
/*
* Set the primary flag on a unixuser structure, ensuring that exactly one
* dude has the flag set at any time for a particular unix uid.
*/
-void afs_SetPrimary(au, aflag)
- register struct unixuser *au;
- register int aflag;
-
+void
+afs_SetPrimary(struct unixuser *au, int aflag)
{
- register struct unixuser *tu;
- register int i;
+ struct unixuser *tu;
+ int i;
struct unixuser *pu;
AFS_STATCNT(afs_SetPrimary);
i = UHash(au->uid);
- pu = (struct unixuser *) 0;
- ObtainWriteLock(&afs_xuser,105);
+ pu = NULL;
+ ObtainWriteLock(&afs_xuser, 105);
/*
* See if anyone is this uid's primary cell yet; recording in pu the
* corresponding user
*/
- for (tu=afs_users[i]; tu; tu=tu->next) {
+ for (tu = afs_users[i]; tu; tu = tu->next) {
if (tu->uid == au->uid && (tu->states & UPrimary)) {
pu = tu;
}
* people see a primary identity until now.
*/
pu->states &= ~UPrimary;
- pu = (struct unixuser *) 0;
+ pu = NULL;
}
if (aflag == 1) {
/* setting au to be primary */
- if (pu) pu->states &= ~UPrimary;
+ if (pu)
+ pu->states &= ~UPrimary;
au->states |= UPrimary;
- }
- else
- if (aflag == 0) {
- /* we don't know if we're supposed to be primary or not */
- if (!pu || au == pu) {
- au->states |= UPrimary;
- }
- else
- au->states &= ~UPrimary;
+ } else if (aflag == 0) {
+ /* we don't know if we're supposed to be primary or not */
+ if (!pu || au == pu) {
+ au->states |= UPrimary;
+ } else
+ au->states &= ~UPrimary;
}
ReleaseWriteLock(&afs_xuser);
-} /*afs_SetPrimary*/
+} /*afs_SetPrimary */
+
+void
+afs_NotifyUser(struct unixuser *auser, int event)
+{
+#ifdef AFS_DARWIN_ENV
+ darwin_notify_perms(auser, event);
+#endif
+}
+
+/**
+ * Mark all of the unixuser records held for a particular PAG as
+ * expired
+ *
+ * @param[in] pag
+ * PAG to expire records for
+ */
+void
+afs_MarkUserExpired(afs_int32 pag)
+{
+ afs_int32 i;
+ struct unixuser *tu;
+
+ i = UHash(pag);
+ ObtainWriteLock(&afs_xuser, 9);
+ for (tu = afs_users[i]; tu; tu = tu->next) {
+ if (tu->uid == pag) {
+ tu->states &= ~UHasTokens;
+ tu->tokenTime = 0;
+ }
+ }
+ ReleaseWriteLock(&afs_xuser);
+}
#if AFS_GCPAGS
/*
- * Called by osi_TraverseProcTable (from afs_GCPAGs) for each
+ * Called by osi_TraverseProcTable (from afs_GCPAGs) for each
* process in the system.
* If the specified process uses a PAG, clear that PAG's temporary
* 'deleteme' flag.
* the per process loop in GCPAGs doesn't have to
* check processes without pags against the afs_users table.
*/
-static afs_int32 afs_GCPAGs_UIDBaseTokenCount=0;
+static afs_int32 afs_GCPAGs_UIDBaseTokenCount = 0;
/*
* These variables keep track of the number of times
* walking the process table, there is something wrong and we should not
* prematurely expire any tokens.
*/
-static size_t afs_GCPAGs_perproc_count=0;
-static size_t afs_GCPAGs_cred_count=0;
+static size_t afs_GCPAGs_perproc_count = 0;
+static size_t afs_GCPAGs_cred_count = 0;
/*
* LOCKS: afs_GCPAGs_perproc_func requires write lock on afs_xuser
*/
-void afs_GCPAGs_perproc_func(AFS_PROC *pproc)
+#if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_STRUCT_HAS_CRED) || defined(HAVE_LINUX_RCU_READ_LOCK))
+void
+afs_GCPAGs_perproc_func(afs_proc_t * pproc)
{
afs_int32 pag, hash, uid;
- const struct AFS_UCRED *pcred;
+ const afs_ucred_t *pcred;
afs_GCPAGs_perproc_count++;
pcred = afs_osi_proc2cred(pproc);
- if(!pcred)
+ if (!pcred)
return;
afs_GCPAGs_cred_count++;
pag = PagInCred(pcred);
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD40_ENV)
- uid = (pag != NOPAG ? pag : pcred->cr_uid);
+#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_LINUX22_ENV)
+ uid = (pag != NOPAG ? pag : afs_cr_uid(pcred));
+#elif defined(AFS_SUN510_ENV)
+ uid = (pag != NOPAG ? pag : crgetruid(pcred));
#else
- uid = (pag != NOPAG ? pag : pcred->cr_ruid);
+ uid = (pag != NOPAG ? pag : afs_cr_ruid(pcred));
#endif
hash = UHash(uid);
- /* if this token is PAG based, or it's UID based and
- UID-based tokens exist */
- if((pag != NOPAG) || (afs_GCPAGs_UIDBaseTokenCount)) {
+ /* if this token is PAG based, or it's UID based and
+ * UID-based tokens exist */
+ if ((pag != NOPAG) || (afs_GCPAGs_UIDBaseTokenCount)) {
/* find the entries for this uid in all cells and clear the not
* referenced flag. Can't use afs_FindUser, because it just returns
- * the specific cell asked for, or the first one found.
- */
+ * the specific cell asked for, or the first one found.
+ */
struct unixuser *pu;
- for(pu = afs_users[hash]; pu; pu = pu->next) {
+ for (pu = afs_users[hash]; pu; pu = pu->next) {
if (pu->uid == uid) {
- if(pu->states & TMP_UPAGNotReferenced) {
+ if (pu->states & TMP_UPAGNotReferenced) {
/* clear the 'deleteme' flag for this entry */
pu->states &= ~TMP_UPAGNotReferenced;
- if(pag == NOPAG) {
- /* This is a uid based token that hadn't
- previously been cleared, so decrement the
- outstanding uid based token count */
+ if (pag == NOPAG) {
+ /* This is a uid based token that hadn't
+ * previously been cleared, so decrement the
+ * outstanding uid based token count */
afs_GCPAGs_UIDBaseTokenCount--;
}
}
}
}
}
+#endif
/*
- * Go through the process table, find all unused PAGs
+ * Go through the process table, find all unused PAGs
* and cause them to be deleted during the next GC.
*
* returns the number of PAGs marked for deletion
* an entry in the login cache, so this routine is not needed.
*/
-afs_int32 afs_GCPAGs(afs_int32 *ReleasedCount)
+afs_int32
+afs_GCPAGs(afs_int32 * ReleasedCount)
{
struct unixuser *pu;
int i;
*ReleasedCount = 0;
/* first, loop through afs_users, setting the temporary 'deleteme' flag */
- ObtainWriteLock(&afs_xuser,419);
- afs_GCPAGs_UIDBaseTokenCount=0;
- for(i=0; i < NUSERS; i++) {
- for(pu = afs_users[i]; pu; pu = pu->next) {
+ ObtainWriteLock(&afs_xuser, 419);
+ afs_GCPAGs_UIDBaseTokenCount = 0;
+ for (i = 0; i < NUSERS; i++) {
+ for (pu = afs_users[i]; pu; pu = pu->next) {
pu->states |= TMP_UPAGNotReferenced;
if (((pu->uid >> 24) & 0xff) != 'A') {
/* this is a uid-based token, */
}
}
- /* Now, iterate through the systems process table,
+ /* Now, iterate through the systems process table,
* for each process, mark it's PAGs (if any) in use.
* i.e. clear the temporary deleteme flag.
*/
- afs_GCPAGs_perproc_count=0;
- afs_GCPAGs_cred_count=0;
+ afs_GCPAGs_perproc_count = 0;
+ afs_GCPAGs_cred_count = 0;
afs_osi_TraverseProcTable();
* (temp deleteme flag still set) will be marked for later deletion,
* by setting their expire times to 0.
*/
- for(i=0; i < NUSERS; i++) {
- for(pu = afs_users[i]; pu; pu = pu->next) {
- if(pu->states & TMP_UPAGNotReferenced) {
-
+ for (i = 0; i < NUSERS; i++) {
+ for (pu = afs_users[i]; pu; pu = pu->next) {
+ if (pu->states & TMP_UPAGNotReferenced) {
+
/* clear the temp flag */
pu->states &= ~TMP_UPAGNotReferenced;
-
+
/* Is this entry on behalf of a 'remote' user ?
* i.e. nfs translator, etc.
*/
- if(!pu->exporter && afs_gcpags == AFS_GCPAGS_OK) {
- /* set the expire times to 0, causes
- * afs_GCUserData to remove this entry
- */
- pu->ct.EndTimestamp = 0;
+ if (!pu->exporter && afs_gcpags == AFS_GCPAGS_OK) {
+ /* make afs_GCUserData remove this entry */
+ pu->states &= ~UHasTokens;
pu->tokenTime = 0;
-
- (*ReleasedCount)++; /* remember how many we marked (info only) */
+
+ (*ReleasedCount)++; /* remember how many we marked (info only) */
}
}
}
return 0;
}
-#endif /* AFS_GCPAGS */
+#endif /* AFS_GCPAGS */
git://git.openafs.org / openafs.git / blobdiff