From: Marcus Watts <mdw@umich.edu>
Date: Fri, 9 Feb 2007 01:07:54 +0000 (+0000)
Subject: STABLE14-linux24-update-20070208
X-Git-Tag: openafs-stable-1_4_3rc2~14
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ad6445f25af8ea908cd61c2d7802960f1c963373;p=packages%2Fo%2Fopenafs.git

STABLE14-linux24-update-20070208

FIXES 53199

update for linux 2.4


(cherry picked from commit 226f3b1b47371bf6c37d8003725fac6d2486ea16)
---

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index ecdcd7e94..a74e63081 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -101,7 +101,6 @@ static ssize_t
 afs_linux_write(struct file *fp, const char *buf, size_t count, loff_t * offp)
 {
     ssize_t code = 0;
-    int code2 = 0;
     struct vcache *vcp = VTOAFS(fp->f_dentry->d_inode);
     struct vrequest treq;
     cred_t *credp = crref();
diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index aedd39616..567db2c37 100644
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -279,7 +279,7 @@ afs_DaemonOp(long parm, long parm2, long parm3, long parm4, long parm5,
 
 #if defined(AFS_LINUX24_ENV) && defined(COMPLETION_H_EXISTS)
 struct afsd_thread_info {
-#if !defined(INIT_WORK_HAS_DATA)
+#if defined(AFS_LINUX26_ENV) && !defined(INIT_WORK_HAS_DATA)
     struct work_struct tq;
 #endif
     unsigned long parm;
@@ -414,13 +414,13 @@ afsd_thread(void *rock)
 }
 
 void
-#if !defined(INIT_WORK_HAS_DATA)
+#if defined(AFS_LINUX26_ENV) && !defined(INIT_WORK_HAS_DATA)
 afsd_launcher(struct work_struct *work)
 #else
 afsd_launcher(void *rock)
 #endif
 {
-#if !defined(INIT_WORK_HAS_DATA)
+#if defined(AFS_LINUX26_ENV) && !defined(INIT_WORK_HAS_DATA)
     struct afsd_thread_info *rock = container_of(work, struct afsd_thread_info, tq);
 #endif