linux-warning-reduction-20090318

[openafs.git] / src / afs / afs_stats.h

diff --git a/src/afs/afs_stats.h b/src/afs/afs_stats.h
index 2fa76aa..2f30216 100644 (file)
--- a/src/afs/afs_stats.h
+++ b/src/afs/afs_stats.h
@@ -35,6 +35,7 @@
 #define AFS_STATS(arg)
 #define XSTATS_DECLS
 #define XSTATS_START_TIME(arg)
+#define XSTATS_START_CMTIME(arg)
 #define XSTATS_END_TIME
 
 #else /* AFS_NOSTATS */
@@ -45,8 +46,8 @@
 typedef struct timeval osi_timeval_t;
 #endif /* !KERNEL */
 
-#define XSTATS_DECLS struct afs_stats_opTimingData *opP; \
-    osi_timeval_t opStartTime, opStopTime, elapsedTime
+#define XSTATS_DECLS struct afs_stats_opTimingData *opP = NULL; \
+    osi_timeval_t opStartTime = { 0, 0}, opStopTime, elapsedTime
 
 #define XSTATS_START_TIME(arg) \
   opP = &(afs_stats_cmfullperf.rpc.fsRPCTimes[arg]); \
@@ -639,6 +640,10 @@ struct afs_CMCallStats {
     afs_int32 C_SRXAFSCB_GetCacheConfig;       /* afs_callback.c */
     afs_int32 C_SRXAFSCB_GetCE64;      /* afs_callback.c */
     afs_int32 C_SRXAFSCB_GetCellByNum; /* afs_callback.c */
+#if defined(AFS_CACHE_BYPASS)
+    afs_int32 C_BPrefetchNoCache;      /* afs_daemons.c */
+       afs_int32 C_afs_ReadNoCache;    /* osi_vnodeops.c */
+#endif 
 };
 
 struct afs_CMMeanStats {
@@ -802,10 +807,14 @@ struct afs_stats_CMPerf {
     afs_uint32 cbloops;
     afs_uint32 osiread_efaults;
     afs_int32 cacheBlocksDiscarded;    /*# cache blocks free but not truncated */
+    afs_int32 cacheBucket0_Discarded;  
+    afs_int32 cacheBucket1_Discarded;  
+    afs_int32 cacheBucket2_Discarded;  
+
     /*
      * Spares for future expansion.
      */
-    afs_int32 spare[13];       /*Spares */
+    afs_int32 spare[10];       /*Spares */
 };