libafs: Remove afs_read duplication

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

diff --git a/src/afs/afs_chunkops.h b/src/afs/afs_chunkops.h
index ffd05ff..e99b9d7 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,9 +58,7 @@ 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) (struct vcache * avc, struct uio * auio,
-                 afs_ucred_t * acred, daddr_t albn, struct buf ** abpp,
-                 int noLock);
+    int (*vreadUIO) (afs_dcache_id_t *, struct uio *);
     int (*vwrite) (struct vcache * avc, struct uio * auio, int aio,
                   afs_ucred_t * acred, int noLock);
     struct dcache *(*GetDSlot) (afs_int32 aslot,
@@ -79,7 +77,7 @@ struct afs_cacheOps {
 #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 
+/* 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 +87,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;