#include "cm_diskcache.h"
#endif /* DISKCACHE95 */
-/* default # of buffers if not changed */
-#define CM_BUF_BUFFERS 100
-
/* default buffer size */
#define CM_BUF_BLOCKSIZE CM_CONFIGDEFAULT_BLOCKSIZE
extern long buf_Get(struct cm_scache *, osi_hyper_t *, cm_req_t *, cm_buf_t **);
-extern afs_uint32 buf_CleanAsyncLocked(cm_scache_t *, cm_buf_t *, cm_req_t *, afs_uint32 flags, afs_uint32 *);
+extern afs_uint32 buf_CleanLocked(cm_scache_t *, cm_buf_t *, cm_req_t *, afs_uint32 flags, afs_uint32 *);
-extern afs_uint32 buf_CleanAsync(cm_scache_t *, cm_buf_t *, cm_req_t *, afs_uint32 flags, afs_uint32 *);
+extern afs_uint32 buf_Clean(cm_scache_t *, cm_buf_t *, cm_req_t *, afs_uint32 flags, afs_uint32 *);
extern void buf_CleanWait(cm_scache_t *, cm_buf_t *, afs_uint32 locked);
extern void buf_ReserveBuffers(afs_uint64);
-extern int buf_TryReserveBuffers(afs_uint64);
+extern afs_uint64 buf_TryReserveBuffers(afs_uint64);
extern void buf_UnreserveBuffers(afs_uint64);
extern long buf_CleanDirtyBuffers(cm_scache_t *scp);
+extern long buf_InvalidateBuffers(cm_scache_t * scp);
+
extern long buf_RDRBuffersExist(cm_fid_t *fidp);
extern long buf_ClearRDRFlag(cm_scache_t *scp, char * reason);
#define buf_DecrementRedirCount() InterlockedDecrement(&cm_data.buf_redirCount)
#define buf_IncrementFreeCount() InterlockedIncrement(&cm_data.buf_freeCount)
#define buf_DecrementFreeCount() InterlockedDecrement(&cm_data.buf_freeCount)
+#define buf_IncrementUsedCount() InterlockedIncrement(&cm_data.buf_usedCount)
+#define buf_DecrementUsedCount() InterlockedDecrement(&cm_data.buf_usedCount)
#else
#define buf_IncrementRedirCount() InterlockedIncrement64(&cm_data.buf_redirCount)
#define buf_DecrementRedirCount() InterlockedDecrement64(&cm_data.buf_redirCount)
#define buf_IncrementFreeCount() InterlockedIncrement64(&cm_data.buf_freeCount)
#define buf_DecrementFreeCount() InterlockedDecrement64(&cm_data.buf_freeCount)
+#define buf_IncrementUsedCount() InterlockedIncrement64(&cm_data.buf_usedCount)
+#define buf_DecrementUsedCount() InterlockedDecrement64(&cm_data.buf_usedCount)
#endif
/* error codes */