From 80732b94ef8a8fd239d8f77d8e10f0d770f0ec24 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Tue, 10 Jul 2012 00:09:14 -0400 Subject: [PATCH] Windows: remove unused CM_SCACHEFLAGs CM_SCACHEFLAG_CALLBACK and CM_SCACHEFLAG_STATD were cleared at various points and tested at various points but never set. Remove them. Change-Id: I018c51febf01e1311dc38e3779e8c8880890f20a Reviewed-on: http://gerrit.openafs.org/7751 Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/afsd/cm_callback.c | 4 ++-- src/WINNT/afsd/cm_scache.c | 8 +++----- src/WINNT/afsd/cm_scache.h | 2 -- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/WINNT/afsd/cm_callback.c b/src/WINNT/afsd/cm_callback.c index d1ed5f0e0..dfd7a2fe1 100644 --- a/src/WINNT/afsd/cm_callback.c +++ b/src/WINNT/afsd/cm_callback.c @@ -726,7 +726,7 @@ SRXAFSCB_GetCE(struct rx_call *callp, long index, AFSDBCacheEntry *cep) break; } cep->states = 0; - if (scp->flags & CM_SCACHEFLAG_STATD) + if (cm_HaveCallback(scp)) cep->states |= 1; if (scp->flags & CM_SCACHEFLAG_RO || scp->flags & CM_SCACHEFLAG_PURERO) cep->states |= 4; @@ -841,7 +841,7 @@ SRXAFSCB_GetCE64(struct rx_call *callp, long index, AFSDBCacheEntry64 *cep) break; } cep->states = 0; - if (scp->flags & CM_SCACHEFLAG_STATD) + if (cm_HaveCallback(scp)) cep->states |= 1; if (scp->flags & CM_SCACHEFLAG_RO || scp->flags & CM_SCACHEFLAG_PURERO) cep->states |= 4; diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c index 61c15190c..4922fd6bf 100644 --- a/src/WINNT/afsd/cm_scache.c +++ b/src/WINNT/afsd/cm_scache.c @@ -185,8 +185,7 @@ long cm_RecycleSCache(cm_scache_t *scp, afs_int32 flags) * also initialize some flags */ scp->fileType = 0; _InterlockedAnd(&scp->flags, - ~(CM_SCACHEFLAG_STATD - | CM_SCACHEFLAG_DELETED + ~( CM_SCACHEFLAG_DELETED | CM_SCACHEFLAG_RO | CM_SCACHEFLAG_PURERO | CM_SCACHEFLAG_OVERQUOTA @@ -639,7 +638,6 @@ cm_ShutdownSCache(void) } scp->cbExpires = 0; scp->cbIssued = 0; - _InterlockedAnd(&scp->flags, ~CM_SCACHEFLAG_CALLBACK); lock_ReleaseWrite(&scp->rw); #ifdef USE_BPLUS @@ -702,7 +700,7 @@ void cm_InitSCache(int newFile, long maxSCaches) scp->dirDataVersion = CM_SCACHE_VERSION_BAD; #endif scp->waitQueueT = NULL; - _InterlockedAnd(&scp->flags, ~(CM_SCACHEFLAG_CALLBACK | CM_SCACHEFLAG_WAITING | CM_SCACHEFLAG_RDR_IN_USE)); + _InterlockedAnd(&scp->flags, ~(CM_SCACHEFLAG_WAITING | CM_SCACHEFLAG_RDR_IN_USE)); scp->redirBufCount = 0; scp->redirQueueT = NULL; @@ -2028,7 +2026,7 @@ void cm_DiscardSCache(cm_scache_t *scp) } scp->cbExpires = 0; scp->cbIssued = 0; - _InterlockedAnd(&scp->flags, ~(CM_SCACHEFLAG_CALLBACK | CM_SCACHEFLAG_LOCAL | CM_SCACHEFLAG_RDR_IN_USE)); + _InterlockedAnd(&scp->flags, ~(CM_SCACHEFLAG_LOCAL | CM_SCACHEFLAG_RDR_IN_USE)); cm_dnlcPurgedp(scp); cm_dnlcPurgevp(scp); cm_FreeAllACLEnts(scp); diff --git a/src/WINNT/afsd/cm_scache.h b/src/WINNT/afsd/cm_scache.h index d7d39d55f..b6bc8111a 100644 --- a/src/WINNT/afsd/cm_scache.h +++ b/src/WINNT/afsd/cm_scache.h @@ -263,9 +263,7 @@ typedef struct cm_scache { #define CM_SCACHETYPE_INVALID 99 /* an invalid link */ /* flag bits */ -#define CM_SCACHEFLAG_STATD 0x01 /* status info is valid */ #define CM_SCACHEFLAG_DELETED 0x02 /* file has been deleted */ -#define CM_SCACHEFLAG_CALLBACK 0x04 /* have a valid callback */ #define CM_SCACHEFLAG_STORING 0x08 /* status being stored back */ #define CM_SCACHEFLAG_FETCHING 0x10 /* status being fetched */ #define CM_SCACHEFLAG_SIZESTORING 0x20 /* status being stored that -- 2.39.5