[OpenAFS-devel] Fwd: Bug#342607: openafs-modules-source: build kernel module on Ubuntu dapper kernel fails

[Russ Allbery]

We got the following suggested small patch to the Debian version of
OpenAFS to allow for builds on kernels with the ocfs2 patch applied.
Could one of the people who knows the Linux kernel module look this over
and let me know if it's sane?  If it is, I'd rather put it in trunk and
1.4 at the same time as the Debian package, rather than keeping it
Debian-specific.

Thanks!


Subject: Bug#342607: openafs-modules-source: build kernel module on Ubuntu
 dapper kernel fails
From: Bj=F6rn Torkelsson <torkel@acc.umu.se>

Package: openafs-modules-source
Version: 1.4.0-2
Severity: normal
Tags: patch

The kernel in Ubuntu dapper, based on the latest upstream 2.6.15 kernel,
and with extra patches, among them ocfs2. One of the ocfs patches
renames WRITEPAGE_ACTIVATE to AOP_WRITEPAGE_ACTIVATE and changes it from
a define to an enum. The attatched patch fixes it.=20

Any chance of getting it applied? I will also file an Ubuntu bug, but it
would be nice to have it fixed in Debian so that the openafs package
does not have to diverge.

/torkel

[...]

--- openafs-1.4.0.orig/src/afs/LINUX/osi_vnodeops.c
+++ openafs-1.4.0/src/afs/LINUX/osi_vnodeops.c
@@ -1414,7 +1414,11 @@
=20
 #if defined(AFS_LINUX26_ENV)
     if (PageReclaim(pp)) {
+# if defined(WRITEPAGE_ACTIVATE)
 	return WRITEPAGE_ACTIVATE;
+# else=20
+	return AOP_WRITEPAGE_ACTIVATE;
+# endif
     }
 #else
     if (PageLaunder(pp)) {