diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 5aefdcde77..2251b5f712 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -99,7 +99,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 3888b3688c..771b95a97c 100644
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -238,7 +238,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;
@@ -373,13 +373,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