From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Fri, 23 Jan 2009 15:20:32 +0000 (+0000)
Subject: linux24-update-20090123
X-Git-Tag: openafs-devel-1_5_61~574
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b690aa8f8139c2b52a1d0dca12e89aad57a9161d;p=packages%2Fo%2Fopenafs.git

linux24-update-20090123

LICENSE IPL10

make things work on linux 2.4 again
---

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index d316dd109..d90a4bc26 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -58,7 +58,7 @@ extern struct backing_dev_info afs_backing_dev_info;
 
 extern struct vcache *afs_globalVp;
 extern int afs_notify_change(struct dentry *dp, struct iattr *iattrp);
-#if defined(AFS_LINUX26_ENV)
+#if defined(AFS_LINUX24_ENV)
 /* Some uses of BKL are perhaps not needed for bypass or memcache--
  * why don't we try it out? */
 extern struct afs_cacheOps afs_UfsCacheOps;
@@ -74,7 +74,7 @@ extern struct afs_cacheOps afs_UfsCacheOps;
 	if(afs_cacheType == &afs_UfsCacheOps)	       \
 	    unlock_kernel();			       \
     } while(0);
-#endif /* AFS_CACHE_BYPASS */
+#endif /* AFS_LINUX24_ENV */
 
 static ssize_t
 afs_linux_read(struct file *fp, char *buf, size_t count, loff_t * offp)
diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c
index 8d174beec..0b56e0f32 100644
--- a/src/rx/rx_kcommon.c
+++ b/src/rx/rx_kcommon.c
@@ -137,7 +137,7 @@ osi_Panic(char *msg, ...)
         msg = "Unknown AFS panic";
     printf(msg, a1, a2, a3);
     panic(msg);
-#elif defined(AFS_DARWIN80_ENV) && !defined(AFS_DARWIN90_ENV)
+#elif (defined(AFS_DARWIN80_ENV) && !defined(AFS_DARWIN90_ENV)) || (defined(AFS_LINUX22_ENV) && !defined(AFS_LINUX_26_ENV))
     char buf[256];
     va_list ap;
     if (!msg)