afs: Never use GetNewDSlot after init

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

diff --git a/src/afs/afs_chunkops.h b/src/afs/afs_chunkops.h
index e49a5ba..3babf89 100644 (file)
--- a/src/afs/afs_chunkops.h
+++ b/src/afs/afs_chunkops.h
@@ -1,7 +1,7 @@
 /*
  * 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
@@ -48,7 +48,7 @@
                      afs_FirstCSize = afs_OtherCSize = (1 << chunk);  }
 
 /*
- * Functions exported by a cache type 
+ * Functions exported by a cache type
  */
 
 struct afs_cacheOps {
@@ -58,15 +58,11 @@ struct afs_cacheOps {
     int (*fwrite) (struct osi_file * fp, afs_int32 offset, void *buf,
                   afs_int32 len);
     int (*close) (struct osi_file * fp);
-    int (*vread) (register struct vcache * avc, struct uio * auio,
-                 AFS_UCRED * acred, daddr_t albn, struct buf ** abpp,
-                 int noLock);
-    int (*vwrite) (register struct vcache * avc, struct uio * auio, int aio,
-                  AFS_UCRED * acred, int noLock);
-    struct dcache *(*GetDSlot) (register afs_int32 aslot,
-                               register struct dcache * tmpdc);
+    int (*vreadUIO) (afs_dcache_id_t *, struct uio *);
+    int (*vwriteUIO) (struct vcache *, afs_dcache_id_t *, struct uio *);
+    struct dcache *(*GetDSlot) (afs_int32 aslot, int indexvalid, int datavalid);
     struct volume *(*GetVolSlot) (void);
-    int (*HandleLink) (register struct vcache * avc, struct vrequest * areq);
+    int (*HandleLink) (struct vcache * avc, struct vrequest * areq);
 };
 
 /* Ideally we should have used consistent naming - like COP_OPEN, COP_TRUNCATE, etc. */
@@ -75,11 +71,21 @@ struct afs_cacheOps {
 #define        afs_CFileRead(file, offset, data, size) (*(afs_cacheType->fread))(file, offset, data, size)
 #define        afs_CFileWrite(file, offset, data, size) (*(afs_cacheType->fwrite))(file, offset, data, size)
 #define        afs_CFileClose(handle)          (*(afs_cacheType->close))(handle)
-#define        afs_GetDSlot(slot, adc)         (*(afs_cacheType->GetDSlot))(slot, adc)
 #define        afs_GetVolSlot()                (*(afs_cacheType->GetVolSlot))()
 #define        afs_HandleLink(avc, areq)       (*(afs_cacheType->HandleLink))(avc, areq)
 
-/* These memcpys should get optimised to simple assignments when afs_dcache_id_t 
+/* Use afs_GetValidDSlot to get a dcache from a dcache slot number when we
+ * know the dcache contains data we want (e.g. it's on the hash table) */
+#define        afs_GetValidDSlot(slot) (*(afs_cacheType->GetDSlot))(slot, 1, 1)
+/* Use afs_GetUnusedDSlot when loading a dcache entry that is on the free or
+ * discard lists (the dcache does not contain valid data, but we know the
+ * dcache entry itself exists). */
+#define        afs_GetUnusedDSlot(slot)        (*(afs_cacheType->GetDSlot))(slot, 1, 0)
+/* Use afs_GetNewDSlot only when initializing dcache slots (the given slot
+ * number may not exist at all). */
+#define        afs_GetNewDSlot(slot)   (*(afs_cacheType->GetDSlot))(slot, 0, 0)
+
+/* These memcpys should get optimised to simple assignments when afs_dcache_id_t
  * is simple */
 static_inline void afs_copy_inode(afs_dcache_id_t *dst, afs_dcache_id_t *src) {
     memcpy(dst, src, sizeof(afs_dcache_id_t));
@@ -89,7 +95,7 @@ static_inline void afs_reset_inode(afs_dcache_id_t *i) {
     memset(i, 0, sizeof(afs_dcache_id_t));
 }
 
-/* We need to have something we can output as the 'inode' for fstrace calls. 
+/* We need to have something we can output as the 'inode' for fstrace calls.
  * This is a hack */
 static_inline int afs_inode2trace(afs_dcache_id_t *i) {
     return i->mem;