From: Björn Torkelsson <torkel@acc.umu.se>
Date: Mon, 19 Dec 2005 03:29:58 +0000 (+0000)
Subject: STABLE14-linux-writepage-rename-20051218
X-Git-Tag: openafs-stable-1_4_1-rc3~10
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=701b5e043e2e66b7308dee96d32602fe0fa10473;p=packages%2Fo%2Fopenafs.git

STABLE14-linux-writepage-rename-20051218


The ocfs2 patch renames WRITEPAGE_ACTIVE to AOP_WRITEPAGE_ACTIVE, and
Ubuntu has applied that patch to their version of the kernel.  Allow for
either.


(cherry picked from commit 37147a406e5a44d762c976773d7f3bd01154460a)
---

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 21a76083a..e088fb06c 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -1412,7 +1412,11 @@ afs_linux_writepage(struct page *pp)
 
 #if defined(AFS_LINUX26_ENV)
     if (PageReclaim(pp)) {
+# if defined(WRITEPAGE_ACTIVATE)
 	return WRITEPAGE_ACTIVATE;
+# else 
+	return AOP_WRITEPAGE_ACTIVATE;
+# endif
     }
 #else
     if (PageLaunder(pp)) {