libafs: Remove unecessary parameters to afs_read

We were providing additional buffer and length parameters to
afs_read which are now unused, as the necessary information is
contained within the iovec. Just remove these parameters to tidy the
code up a bit.

Change-Id: I2ca80b20e253e0d54be759e6d504961958b40e6e
Reviewed-on: http://gerrit.openafs.org/4464
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/DARWIN/osi_vnodeops.c b/src/afs/DARWIN/osi_vnodeops.c
index e33514c..2a0cdfc 100644 (file)
--- a/src/afs/DARWIN/osi_vnodeops.c
+++ b/src/afs/DARWIN/osi_vnodeops.c
@@ -812,7 +812,7 @@ afs_vop_read(ap)
 #endif
     AFS_GLOCK();
     osi_FlushPages(avc, vop_cred);     /* hold bozon lock, but not basic vnode lock */
-    code = afs_read(avc, ap->a_uio, vop_cred, 0, 0, 0);
+    code = afs_read(avc, ap->a_uio, vop_cred, 0);
     AFS_GUNLOCK();
     return code;
 }
@@ -898,7 +898,7 @@ afs_vop_pagein(ap)
 #endif
     AFS_GLOCK();
     osi_FlushPages(tvc, vop_cred);     /* hold bozon lock, but not basic vnode lock */
-    code = afs_read(tvc, uio, cred, 0, 0, 0);
+    code = afs_read(tvc, uio, cred, 0);
     if (code == 0) {
        ObtainWriteLock(&tvc->lock, 2);
        tvc->f.states |= CMAPPED;

diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c
index 31e1c4b..5be9ad0 100644 (file)
--- a/src/afs/FBSD/osi_vnodeops.c
+++ b/src/afs/FBSD/osi_vnodeops.c
@@ -764,7 +764,7 @@ afs_vop_read(ap)
     struct vcache *avc = VTOAFS(ap->a_vp);
     AFS_GLOCK();
     osi_FlushPages(avc, ap->a_cred);   /* hold bozon lock, but not basic vnode lock */
-    code = afs_read(avc, ap->a_uio, ap->a_cred, 0, 0, 0);
+    code = afs_read(avc, ap->a_uio, ap->a_cred, 0);
     AFS_GUNLOCK();
     return code;
 }
@@ -844,7 +844,7 @@ afs_vop_getpages(struct vop_getpages_args *ap)
 
     AFS_GLOCK();
     osi_FlushPages(avc, osi_curcred());        /* hold bozon lock, but not basic vnode lock */
-    code = afs_read(avc, &uio, osi_curcred(), 0, 0, 0);
+    code = afs_read(avc, &uio, osi_curcred(), 0);
     AFS_GUNLOCK();
     pmap_qremove(kva, npages);
 

diff --git a/src/afs/HPUX/osi_vnodeops.c b/src/afs/HPUX/osi_vnodeops.c
index a9114ef..f113596 100644 (file)
--- a/src/afs/HPUX/osi_vnodeops.c
+++ b/src/afs/HPUX/osi_vnodeops.c
@@ -243,7 +243,7 @@ afs_bread(vp, lbn, bpp)
     uio.uio_fpflags = 0;
     *bpp = 0;
 
-    error = afs_read(VTOAFS(vp), &uio, p_cred(u.u_procp), lbn, bpp, 0);
+    error = afs_read(VTOAFS(vp), &uio, p_cred(u.u_procp), 0);
     if (error) {
        afs_bread_freebp = bp;
        return error;

diff --git a/src/afs/IRIX/osi_vnodeops.c b/src/afs/IRIX/osi_vnodeops.c
index 33d94e3..0f13a9c 100644 (file)
--- a/src/afs/IRIX/osi_vnodeops.c
+++ b/src/afs/IRIX/osi_vnodeops.c
@@ -846,7 +846,7 @@ OSI_VC_DECL(avc);
 
     if (bp->b_flags & B_READ) {
        uio->uio_fmode = FREAD;
-       error = afs_read(vp, uio, cr, 0, 0, 0);
+       error = afs_read(vp, uio, cr, 0);
     } else {
        uio->uio_fmode = FWRITE;
        error = afs_write(vp, uio, 0, cr, 0);

diff --git a/src/afs/NBSD/osi_vnodeops.c b/src/afs/NBSD/osi_vnodeops.c
index c8a0edf..c7c8729 100644 (file)
--- a/src/afs/NBSD/osi_vnodeops.c
+++ b/src/afs/NBSD/osi_vnodeops.c
@@ -602,9 +602,7 @@ afs_nbsd_read(void *v)
         printf("nbsd_read enter %p", ap);
 
     AFS_GLOCK();
-    code =
-        afs_read(VTOAFS(ap->a_vp), ap->a_uio, ap->a_cred, (daddr_t) 0, NULL,
-                0);
+    code = afs_read(VTOAFS(ap->a_vp), ap->a_uio, ap->a_cred, 0);
     AFS_GUNLOCK();
 
     if (afs_debug & AFSDEB_VNLAYER)

diff --git a/src/afs/OBSD/osi_vnodeops.c b/src/afs/OBSD/osi_vnodeops.c
index 317cb52..5035707 100644 (file)
--- a/src/afs/OBSD/osi_vnodeops.c
+++ b/src/afs/OBSD/osi_vnodeops.c
@@ -462,9 +462,7 @@ afs_obsd_read(void *v)
     int code;
 
     AFS_GLOCK();
-    code =
-       afs_read(VTOAFS(ap->a_vp), ap->a_uio, ap->a_cred, (daddr_t) 0, NULL,
-                0);
+    code = afs_read(VTOAFS(ap->a_vp), ap->a_uio, ap->a_cred, 0);
     AFS_GUNLOCK();
     return code;
 }

diff --git a/src/afs/UKERNEL/afs_usrops.c b/src/afs/UKERNEL/afs_usrops.c
index 89135a0..9df2c29 100644 (file)
--- a/src/afs/UKERNEL/afs_usrops.c
+++ b/src/afs/UKERNEL/afs_usrops.c
@@ -2391,7 +2391,6 @@ uafs_pread_r(int fd, char *buf, int len, off_t offset)
     struct usr_uio uio;
     struct iovec iov[1];
     struct usr_vnode *fileP;
-    struct usr_buf *bufP;
 
     /*
      * Make sure this is an open file
@@ -2417,7 +2416,7 @@ uafs_pread_r(int fd, char *buf, int len, off_t offset)
     /*
      * do the read
      */
-    code = afs_read(VTOAFS(fileP), &uio, get_user_struct()->u_cred, 0, &bufP, 0);
+    code = afs_read(VTOAFS(fileP), &uio, get_user_struct()->u_cred, 0);
     if (code) {
        errno = code;
        return -1;

diff --git a/src/afs/UKERNEL/osi_vnodeops.c b/src/afs/UKERNEL/osi_vnodeops.c
index ecfa51a..290d46d 100644 (file)
--- a/src/afs/UKERNEL/osi_vnodeops.c
+++ b/src/afs/UKERNEL/osi_vnodeops.c
@@ -24,7 +24,7 @@ afs_vrdwr(struct usr_vnode *avc, struct usr_uio *uio, int rw, int io,
     if (rw == UIO_WRITE) {
        rc = afs_write(VTOAFS(avc), uio, io, cred, 0);
     } else {
-       rc = afs_read(VTOAFS(avc), uio, cred, 0, 0, 0);
+       rc = afs_read(VTOAFS(avc), uio, cred, 0);
     }
 
     return rc;

diff --git a/src/afs/VNOPS/afs_vnop_read.c b/src/afs/VNOPS/afs_vnop_read.c
index dfdf343..765e89a 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_read.c
+++ b/src/afs/VNOPS/afs_vnop_read.c
@@ -43,7 +43,7 @@ void afs_PrefetchChunk(struct vcache *avc, struct dcache *adc,
 
 int
 afs_read(struct vcache *avc, struct uio *auio, afs_ucred_t *acred,
-        daddr_t albn, struct buf **abpp, int noLock)
+        int noLock)
 {
     afs_size_t totalLength;
     afs_size_t transferLength;

diff --git a/src/afs/afs.h b/src/afs/afs.h
index 1c75991..fb01206 100644 (file)
--- a/src/afs/afs.h
+++ b/src/afs/afs.h
@@ -1352,9 +1352,9 @@ extern struct brequest afs_brs[NBRS];     /* request structures */
         (*(afs_cacheType->vwrite))(avc, uio, aio, acred, nolock)
 
 #define        afs_rdwr(avc, uio, rw, io, cred) \
-    (((rw) == UIO_WRITE) ? afs_write(avc, uio, io, cred, 0) : afs_read(avc, uio, cred, 0, 0, 0))
+    (((rw) == UIO_WRITE) ? afs_write(avc, uio, io, cred, 0) : afs_read(avc, uio, cred, 0))
 #define        afs_nlrdwr(avc, uio, rw, io, cred) \
-    (((rw) == UIO_WRITE) ? afs_write(avc, uio, io, cred, 1) : afs_read(avc, uio, cred, 0, 0, 1))
+    (((rw) == UIO_WRITE) ? afs_write(avc, uio, io, cred, 1) : afs_read(avc, uio, cred, 1))
 
 /* Cache size truncation uses the following low and high water marks:
  * If the cache is more than 95% full (CM_DCACHECOUNTFREEPCT), the cache

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 9a340a5..ccad57b 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -1243,8 +1243,7 @@ extern int afs_open(struct vcache **avcp, afs_int32 aflags,
 
 /* VNOPS/afs_vnop_read.c */
 extern int afs_read(struct vcache *avc, struct uio *auio,
-                   afs_ucred_t *acred, daddr_t albn,
-                   struct buf **abpp, int noLock);
+                   afs_ucred_t *acred, int noLock);
 
 extern int afs_UFSReadUIO(afs_dcache_id_t *cacheId, struct uio *tuiop);