osi-initcacheinfo-cleanup-20050427

[openafs.git] / src / afs / LINUX / osi_misc.c

diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c
index 6a144e9..36e01fd 100644 (file)
--- a/src/afs/LINUX/osi_misc.c
+++ b/src/afs/LINUX/osi_misc.c
@@ -110,12 +110,12 @@ int
 osi_InitCacheInfo(char *aname)
 {
     int code;
-    struct dentry *dp,*dpp;
+    struct dentry *dp;
     extern ino_t cacheInode;
     extern struct osi_dev cacheDev;
     extern afs_int32 afs_fsfragsize;
     extern struct super_block *afs_cacheSBp;
-    extern struct vfsmnt *afs_cacheMnt;
+    extern struct vfsmount *afs_cacheMnt;
     code = osi_lookupname_internal(aname, 1, &afs_cacheMnt, &dp);
     if (code)
        return ENOENT;
@@ -141,7 +141,11 @@ osi_InitCacheInfo(char *aname)
 int
 osi_rdwr(struct osi_file *osifile, uio_t * uiop, int rw)
 {
+#ifdef AFS_LINUX24_ENV
+    struct file *filp = osifile->filp;
+#else
     struct file *filp = &osifile->file;
+#endif
     KERNEL_SPACE_DECL;
     int code = 0;
     struct iovec *iov;