linux-writepage-rename-20051218
authorBjörn Torkelsson <torkel@acc.umu.se>
Mon, 19 Dec 2005 03:27:21 +0000 (03:27 +0000)
committerRuss Allbery <rra@stanford.edu>
Mon, 19 Dec 2005 03:27:21 +0000 (03:27 +0000)
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.

src/afs/LINUX/osi_vnodeops.c

index 21a7608..e088fb0 100644 (file)
@@ -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)) {