From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 21 Oct 2008 14:44:50 +0000 (+0000)
Subject: linux24-writepage-antideadlock-20081021
X-Git-Tag: openafs-devel-1_5_61~733
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9bca8ce22add91b32f45922650c429404d74797d;p=packages%2Fo%2Fopenafs.git

linux24-writepage-antideadlock-20081021

LICENSE IPL10

also make this work for 2.4.x
---

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 7638a5c0e..804770d70 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -1901,10 +1901,15 @@ afs_linux_writepage_sync(struct inode *ip, struct page *pp,
 	maybe_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);