From 8ebade0e67c62335416ba3cfd40d19d1e152de02 Mon Sep 17 00:00:00 2001 From: Marc Dionne Date: Fri, 20 Nov 2009 17:50:41 -0500 Subject: [PATCH] Revert "osi_UFSOpen returns struct osi_file *" This reverts commit 4057a9941b95f7a00c57738c1810ec5abf315e97. UFSOpen shares a prototype with MemCacheOpen because of the afs_cacheOps structure. This is why a void * is used. Revert until a more complete fix can be submitted that adresses the memcache case as well. Change-Id: I2e259c08a0bfbc695260c981d29319c2bb7c93dd Reviewed-on: http://gerrit.openafs.org/865 Reviewed-by: Simon Wilkinson Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- src/afs/AIX/osi_file.c | 4 ++-- src/afs/DARWIN/osi_file.c | 4 ++-- src/afs/FBSD/osi_file.c | 4 ++-- src/afs/HPUX/osi_file.c | 4 ++-- src/afs/IRIX/osi_file.c | 4 ++-- src/afs/LINUX/osi_file.c | 4 ++-- src/afs/LINUX24/osi_file.c | 8 ++++---- src/afs/NBSD/osi_file.c | 4 ++-- src/afs/OBSD/osi_file.c | 4 ++-- src/afs/SOLARIS/osi_file.c | 10 +++++----- src/afs/UKERNEL/afs_usrops.c | 2 +- src/afs/VNOPS/afs_vnop_read.c | 2 +- src/afs/VNOPS/afs_vnop_write.c | 2 +- src/afs/afs_prototypes.h | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/afs/AIX/osi_file.c b/src/afs/AIX/osi_file.c index 7510b33e0..410843b9e 100644 --- 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; -struct osi_file * +void * 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 afile; + return (void *)afile; } int diff --git a/src/afs/DARWIN/osi_file.c b/src/afs/DARWIN/osi_file.c index b15ceb78d..3edd4967f 100644 --- a/src/afs/DARWIN/osi_file.c +++ b/src/afs/DARWIN/osi_file.c @@ -130,7 +130,7 @@ VnodeToDev(vnode_t avp) #endif } -struct osi_file * +void * 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 afile; + return (void *)afile; } int diff --git a/src/afs/FBSD/osi_file.c b/src/afs/FBSD/osi_file.c index c71d4458f..fdac540c4 100644 --- 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; -struct osi_file * +void * 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 afile; + return (void *)afile; } int diff --git a/src/afs/HPUX/osi_file.c b/src/afs/HPUX/osi_file.c index f13433ed9..1d2ae5c3a 100644 --- 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; -struct osi_file * +void * 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 afile; + return (void *)afile; } int diff --git a/src/afs/IRIX/osi_file.c b/src/afs/IRIX/osi_file.c index 697c1af96..10ca92d6e 100644 --- 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. */ -struct osi_file * +void * 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 afile; + return (void *)afile; } int diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c index 9264ea43d..7af6b6d71 100644 --- 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; } -struct osi_file * +void * 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 afile; + return (void *)afile; } #if defined(LINUX_USE_FH) diff --git a/src/afs/LINUX24/osi_file.c b/src/afs/LINUX24/osi_file.c index 060e06153..ba58d051b 100644 --- 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; } -struct osi_file * +void * 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 afile; + return (void *)afile; } #else -struct osi_file * +void * 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 afile; + return (void *)afile; } #endif diff --git a/src/afs/NBSD/osi_file.c b/src/afs/NBSD/osi_file.c index 8e61af9a5..cf85911fb 100644 --- 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; -struct osi_file * +void * 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 afile; + return (void *)afile; } int diff --git a/src/afs/OBSD/osi_file.c b/src/afs/OBSD/osi_file.c index 36610d1cb..a82cd02b8 100644 --- 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; -struct osi_file * +void * 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 afile; + return (void *)afile; } int diff --git a/src/afs/SOLARIS/osi_file.c b/src/afs/SOLARIS/osi_file.c index ff159a657..5b18303aa 100644 --- 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); } -struct osi_file * +void * 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 afile; + return (void *)afile; } #endif /* AFS_HAVE_VXFS */ -struct osi_file * +void * 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 afile; + return (void *)afile; } /** * In Solaris 7 we use 64 bit inode numbers */ -struct osi_file * +void * 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 a39692461..353d0e70b 100644 --- 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 */ -struct osi_file * +void * 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 a575c2fdf..6ca652b60 100644 --- 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 = osi_UFSOpen(&tdc->f.inode); + tfile = (struct osi_file *)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 6203bd7e1..33437d056 100644 --- 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 = osi_UFSOpen(&tdc->f.inode); + tfile = (struct osi_file *)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 8db93e78c..327e2e906 100644 --- 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 struct osi_file *osi_UFSOpen(afs_dcache_id_t *ainode); +extern void *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 -- 2.39.5