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 <sxw@inf.ed.ac.uk>
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
extern struct vfs *afs_cacheVfsp;
-struct osi_file *
+void *
osi_UFSOpen(afs_dcache_id_t *ainode)
{
struct inode *ip;
afile->size = VTOI(afile->vnode)->i_size;
afile->offset = 0;
afile->proc = (int (*)())0;
- return afile;
+ return (void *)afile;
}
int
#endif
}
-struct osi_file *
+void *
osi_UFSOpen(afs_dcache_id_t *ainode)
{
struct vnode *vp;
code = afs_osi_Stat(afile, &tstat);
afile->size = tstat.size;
#endif
- return afile;
+ return (void *)afile;
}
int
extern struct mount *afs_cacheVfsp;
-struct osi_file *
+void *
osi_UFSOpen(afs_dcache_id_t *ainode)
{
struct osi_file *afile;
afile->size = VTOI(vp)->i_size;
afile->offset = 0;
afile->proc = NULL;
- return afile;
+ return (void *)afile;
}
int
extern struct vfs *afs_cacheVfsp;
-struct osi_file *
+void *
osi_UFSOpen(afs_dcache_id_t *ainode)
{
struct inode *ip;
afile->size = VTOI(afile->vnode)->i_size;
afile->offset = 0;
afile->proc = (int (*)())0;
- return afile;
+ return (void *)afile;
}
int
}
/* Force to 64 bits, even for EFS filesystems. */
-struct osi_file *
+void *
osi_UFSOpen(afs_dcache_id_t *ainode)
{
struct inode *ip;
afile->size = VnodeToSize(afile->vnode);
afile->offset = 0;
afile->proc = (int (*)())0;
- return afile;
+ return (void *)afile;
}
int
return filp;
}
-struct osi_file *
+void *
osi_UFSOpen(afs_dcache_id_t *ainode)
{
struct osi_file *afile = NULL;
AFS_GLOCK();
afile->offset = 0;
afile->proc = (int (*)())0;
- return afile;
+ return (void *)afile;
}
#if defined(LINUX_USE_FH)
return filp;
}
-struct osi_file *
+void *
osi_UFSOpen(afs_dcache_id_t *ainode)
{
struct osi_file *afile = NULL;
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;
AFS_GLOCK();
afile->offset = 0;
afile->proc = (int (*)())0;
- return afile;
+ return (void *)afile;
}
#endif
extern struct mount *afs_cacheVfsp;
-struct osi_file *
+void *
osi_UFSOpen(afs_dcache_id_t *ainode)
{
struct inode *ip;
afile->size = VTOI(afile->vnode)->i_size;
afile->offset = 0;
afile->proc = (int (*)())0;
- return afile;
+ return (void *)afile;
}
int
extern struct mount *afs_cacheVfsp;
-struct osi_file *
+void *
osi_UFSOpen(afs_dcache_id_t *ainode)
{
struct osi_file *afile;
#endif
afile->offset = 0;
afile->proc = NULL;
- return afile;
+ return (void *)afile;
}
int
return (afs_int32) (vattr.va_size);
}
-struct osi_file *
+void *
osi_VxfsOpen(afs_dcache_id_t *ainode)
{
struct vnode *vp;
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
#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;
/*
* open a file given its i-node number
*/
-struct osi_file *
+void *
osi_UFSOpen(afs_dcache_id_t *ino)
{
int rc;
}
} 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);
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 */
/* 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