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 ecdcd7e94709af67213d6072ace2e8b2b9c986d4..a74e630812b5b401090bfc6cc9e45da6a7c681ae 100644 (file)
--- 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 aedd39616ff78665ee5dd952ae01ef19a62ab3bf..567db2c37afd83aa0a6387691ad4c6b88e028621 100644 (file)
--- 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