From: Michael Meffie <mmeffie@sinenomine.net>
Date: Fri, 17 Jul 2009 15:06:34 +0000 (-0400)
Subject: Build on linux 2.4 again
X-Git-Tag: openafs-stable-1_4_12pre1~132
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d6fa9528385d7b5a76ea4058761766aa945adb4c;p=packages%2Fo%2Fopenafs.git

Build on linux 2.4 again

Add missing conditional to fix building on
linux 2.4.

FIXES 125120

Reviewed-on: http://gerrit.openafs.org/http://gerrit.openafs.org/148
Tested-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Tested-by: Russ Allbery <rra@stanford.edu>
Reviewed-by: Russ Allbery <rra@stanford.edu>
(cherry picked from commit f6e46babd8e3a0d51d31ae381748516330f5b84d)
Reviewed-on: http://gerrit.openafs.org/386
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 0283c0681..77c444010 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -1678,10 +1678,12 @@ afs_linux_writepage(struct page *pp)
   do_it:
     status = afs_linux_writepage_sync(inode, pp, 0, offset);
     SetPageUptodate(pp);
+#if defined(AFS_LINUX26_ENV)
 #if defined(WRITEPAGE_ACTIVATE)
     if ( status != WRITEPAGE_ACTIVATE )
 #else
     if ( status != AOP_WRITEPAGE_ACTIVATE )
+#endif
 #endif
 	UnlockPage(pp);
     if (status == offset)