STABLE14-linux24-writepage-antideadlock-20081021

LICENSE IPL10

also make this work for 2.4.x

(cherry picked from commit 9bca8ce22add91b32f45922650c429404d74797d)

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 2091ff71a51e26eda999a2d7334fb3f2c3ef2379..0350e09c455a13b6baf16356e40985a202fea331 100644 (file)
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -1563,10 +1563,15 @@ afs_linux_writepage_sync(struct inode *ip, struct page *pp,
        unlock_kernel();
        crfree(credp);
        kunmap(pp);
+#ifdef AFS_LINUX26_ENV
 #if defined(WRITEPAGE_ACTIVATE)
        return WRITEPAGE_ACTIVATE;
 #else
        return AOP_WRITEPAGE_ACTIVATE;
+#endif
+#else
+       /* should mark it dirty? */
+       return(0); 
 #endif
     }
     ReleaseReadLock(&vcp->lock);