osi_UFSOpen returns struct osi_file *

The osi_UFSOpen function always returns a (struct osi_file *). Fix
the code to reflect this, rather than casting to and from (void *).

Change-Id: I3aa0bb17b547060671aa7045a8237b3926ec613f
Reviewed-on: http://gerrit.openafs.org/851
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/AIX/osi_file.c b/src/afs/AIX/osi_file.c
index 410843b..7510b33 100644 (file)
--- a/src/afs/AIX/osi_file.c
+++ b/src/afs/AIX/osi_file.c
@@ -23,7 +23,7 @@ extern struct osi_dev cacheDev;
 extern struct vfs *afs_cacheVfsp;
 
 
-void *
+struct osi_file *
 osi_UFSOpen(afs_dcache_id_t *ainode)
 {
     struct inode *ip;
@@ -56,7 +56,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode)
     afile->size = VTOI(afile->vnode)->i_size;
     afile->offset = 0;
     afile->proc = (int (*)())0;
-    return (void *)afile;
+    return afile;
 }
 
 int

diff --git a/src/afs/DARWIN/osi_file.c b/src/afs/DARWIN/osi_file.c
index 3edd496..b15ceb7 100644 (file)
--- a/src/afs/DARWIN/osi_file.c
+++ b/src/afs/DARWIN/osi_file.c
@@ -130,7 +130,7 @@ VnodeToDev(vnode_t avp)
 #endif
 }
 
-void *
+struct osi_file *
 osi_UFSOpen(afs_dcache_id_t *ainode)
 {
     struct vnode *vp;
@@ -204,7 +204,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode)
     code = afs_osi_Stat(afile, &tstat);
     afile->size = tstat.size;
 #endif
-    return (void *)afile;
+    return afile;
 }
 
 int

diff --git a/src/afs/FBSD/osi_file.c b/src/afs/FBSD/osi_file.c
index fdac540..c71d445 100644 (file)
--- a/src/afs/FBSD/osi_file.c
+++ b/src/afs/FBSD/osi_file.c
@@ -23,7 +23,7 @@ extern struct osi_dev cacheDev;
 extern struct mount *afs_cacheVfsp;
 
 
-void *
+struct osi_file *
 osi_UFSOpen(afs_dcache_id_t *ainode)
 {
     struct osi_file *afile;
@@ -59,7 +59,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode)
     afile->size = VTOI(vp)->i_size;
     afile->offset = 0;
     afile->proc = NULL;
-    return (void *)afile;
+    return afile;
 }
 
 int

diff --git a/src/afs/HPUX/osi_file.c b/src/afs/HPUX/osi_file.c
index 1d2ae5c..f13433e 100644 (file)
--- a/src/afs/HPUX/osi_file.c
+++ b/src/afs/HPUX/osi_file.c
@@ -24,7 +24,7 @@ extern struct osi_dev cacheDev;
 extern struct vfs *afs_cacheVfsp;
 
 
-void *
+struct osi_file *
 osi_UFSOpen(afs_dcache_id_t *ainode)
 {
     struct inode *ip;
@@ -57,7 +57,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode)
     afile->size = VTOI(afile->vnode)->i_size;
     afile->offset = 0;
     afile->proc = (int (*)())0;
-    return (void *)afile;
+    return afile;
 }
 
 int

diff --git a/src/afs/IRIX/osi_file.c b/src/afs/IRIX/osi_file.c
index 10ca92d..697c1af 100644 (file)
--- a/src/afs/IRIX/osi_file.c
+++ b/src/afs/IRIX/osi_file.c
@@ -37,7 +37,7 @@ afs_XFSIGetVnode(afs_dcache_id_t *ainode)
 }
 
 /* Force to 64 bits, even for EFS filesystems. */
-void *
+struct osi_file *
 osi_UFSOpen(afs_dcache_id_t *ainode)
 {
     struct inode *ip;
@@ -62,7 +62,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode)
     afile->size = VnodeToSize(afile->vnode);
     afile->offset = 0;
     afile->proc = (int (*)())0;
-    return (void *)afile;
+    return afile;
 }
 
 int

diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c
index 7af6b6d..9264ea4 100644 (file)
--- a/src/afs/LINUX/osi_file.c
+++ b/src/afs/LINUX/osi_file.c
@@ -68,7 +68,7 @@ afs_linux_raw_open(afs_dcache_id_t *ainode)
     return filp;
 }
 
-void *
+struct osi_file *
 osi_UFSOpen(afs_dcache_id_t *ainode)
 {
     struct osi_file *afile = NULL;
@@ -97,7 +97,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode)
     AFS_GLOCK();
     afile->offset = 0;
     afile->proc = (int (*)())0;
-    return (void *)afile;
+    return afile;
 }
 
 #if defined(LINUX_USE_FH)

diff --git a/src/afs/LINUX24/osi_file.c b/src/afs/LINUX24/osi_file.c
index ba58d05..060e061 100644 (file)
--- a/src/afs/LINUX24/osi_file.c
+++ b/src/afs/LINUX24/osi_file.c
@@ -71,7 +71,7 @@ afs_linux_raw_open(afs_dcache_id_t *ainode)
     return filp;
 }
 
-void *
+struct osi_file *
 osi_UFSOpen(afs_dcache_id_t *ainode)
 {
     struct osi_file *afile = NULL;
@@ -100,10 +100,10 @@ osi_UFSOpen(afs_dcache_id_t *ainode)
     AFS_GLOCK();
     afile->offset = 0;
     afile->proc = (int (*)())0;
-    return (void *)afile;
+    return afile;
 }
 #else
-void *
+struct osi_file *
 osi_UFSOpen(afs_dcache_id_t *ainode)
 {
     register struct osi_file *afile = NULL;
@@ -150,7 +150,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode)
     AFS_GLOCK();
     afile->offset = 0;
     afile->proc = (int (*)())0;
-    return (void *)afile;
+    return afile;
 }
 #endif
 

diff --git a/src/afs/NBSD/osi_file.c b/src/afs/NBSD/osi_file.c
index cf85911..8e61af9 100644 (file)
--- a/src/afs/NBSD/osi_file.c
+++ b/src/afs/NBSD/osi_file.c
@@ -23,7 +23,7 @@ extern struct osi_dev cacheDev;
 extern struct mount *afs_cacheVfsp;
 
 
-void *
+struct osi_file *
 osi_UFSOpen(afs_dcache_id_t *ainode)
 {
     struct inode *ip;
@@ -49,7 +49,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode)
     afile->size = VTOI(afile->vnode)->i_size;
     afile->offset = 0;
     afile->proc = (int (*)())0;
-    return (void *)afile;
+    return afile;
 }
 
 int

diff --git a/src/afs/OBSD/osi_file.c b/src/afs/OBSD/osi_file.c
index a82cd02..36610d1 100644 (file)
--- a/src/afs/OBSD/osi_file.c
+++ b/src/afs/OBSD/osi_file.c
@@ -23,7 +23,7 @@ extern struct osi_dev cacheDev;
 extern struct mount *afs_cacheVfsp;
 
 
-void *
+struct osi_file *
 osi_UFSOpen(afs_dcache_id_t *ainode)
 {
     struct osi_file *afile;
@@ -53,7 +53,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode)
 #endif
     afile->offset = 0;
     afile->proc = NULL;
-    return (void *)afile;
+    return afile;
 }
 
 int

diff --git a/src/afs/SOLARIS/osi_file.c b/src/afs/SOLARIS/osi_file.c
index 5b18303..ff159a6 100644 (file)
--- a/src/afs/SOLARIS/osi_file.c
+++ b/src/afs/SOLARIS/osi_file.c
@@ -141,7 +141,7 @@ VnodeToSize(vnode_t * vp)
     return (afs_int32) (vattr.va_size);
 }
 
-void *
+struct osi_file *
 osi_VxfsOpen(afs_dcache_id_t *ainode)
 {
     struct vnode *vp;
@@ -160,11 +160,11 @@ osi_VxfsOpen(afs_dcache_id_t *ainode)
     afile->size = VnodeToSize(afile->vnode);
     afile->offset = 0;
     afile->proc = (int (*)())0;
-    return (void *)afile;
+    return afile;
 }
 #endif /* AFS_HAVE_VXFS */
 
-void *
+struct osi_file *
 osi_UfsOpen(afs_dcache_id_t *ainode)
 {
 #ifdef AFS_CACHE_VNODE_PATH
@@ -248,13 +248,13 @@ osi_UfsOpen(afs_dcache_id_t *ainode)
 #endif
     afile->offset = 0;
     afile->proc = (int (*)())0;
-    return (void *)afile;
+    return afile;
 }
 
 /**
   * In Solaris 7 we use 64 bit inode numbers
   */
-void *
+struct osi_file *
 osi_UFSOpen(afs_dcache_id_t *ainode)
 {
     extern int cacheDiskType;

diff --git a/src/afs/UKERNEL/afs_usrops.c b/src/afs/UKERNEL/afs_usrops.c
index 353d0e7..a396924 100644 (file)
--- a/src/afs/UKERNEL/afs_usrops.c
+++ b/src/afs/UKERNEL/afs_usrops.c
@@ -698,7 +698,7 @@ lookupname(char *fnamep, int segflg, int followlink,
 /*
  * open a file given its i-node number
  */
-void *
+struct osi_file *
 osi_UFSOpen(afs_dcache_id_t *ino)
 {
     int rc;

diff --git a/src/afs/VNOPS/afs_vnop_read.c b/src/afs/VNOPS/afs_vnop_read.c
index 6ca652b..a575c2f 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_read.c
+++ b/src/afs/VNOPS/afs_vnop_read.c
@@ -785,7 +785,7 @@ afs_UFSRead(register struct vcache *avc, struct uio *auio,
            }
        } else {
            /* get the data from the file */
-           tfile = (struct osi_file *)osi_UFSOpen(&tdc->f.inode);
+           tfile = osi_UFSOpen(&tdc->f.inode);
 #ifdef AFS_DARWIN80_ENV
            trimlen = len;
             tuiop = afsio_darwin_partialcopy(auio, trimlen);

diff --git a/src/afs/VNOPS/afs_vnop_write.c b/src/afs/VNOPS/afs_vnop_write.c
index 33437d0..6203bd7 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_write.c
+++ b/src/afs/VNOPS/afs_vnop_write.c
@@ -422,7 +422,7 @@ afs_UFSWrite(register struct vcache *avc, struct uio *auio, int aio,
            error = EIO;
            break;
        }
-       tfile = (struct osi_file *)osi_UFSOpen(&tdc->f.inode);
+       tfile = osi_UFSOpen(&tdc->f.inode);
        len = totalLength;      /* write this amount by default */
        offset = filePos - AFS_CHUNKTOBASE(tdc->f.chunk);
        max = AFS_CHUNKTOSIZE(tdc->f.chunk);    /* max size of this chunk */

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 327e2e9..8db93e7 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -673,7 +673,7 @@ extern int afs_syscall_iincdec(int, int, int, int);
 
 /* ARCH/osi_file.c */
 extern int afs_osicred_initialized;
-extern void *osi_UFSOpen(afs_dcache_id_t *ainode);
+extern struct osi_file *osi_UFSOpen(afs_dcache_id_t *ainode);
 #if defined(AFS_LINUX22_ENV)
 extern void osi_get_fh(struct dentry *dp, afs_ufs_dcache_id_t *ainode);
 #endif