Subject: afs/fs/cachefs io.c,1.13,1.14 aops.c,1.37,1.38

From: [email-masked]
Date: Tue, 01 Jul 2003 18:44:53 +0100

Update of /home/cvs/afs/fs/cachefs
In directory phoenix.infradead.org:/tmp/cvs-serv18434/fs/cachefs

Modified Files:
	io.c aops.c 
Log Message:
don't call try_to_release_page() - which isn't exported from core kernel

Index: io.c
===================================================================
RCS file: /home/cvs/afs/fs/cachefs/io.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- io.c	23 May 2003 12:59:21 -0000	1.13
+++ io.c	1 Jul 2003 17:44:50 -0000	1.14
@@ -335,8 +335,14 @@
 	 * The get_block cached value has been unconditionally invalidated,
 	 * so real IO is not possible anymore.
 	 */
-	if (offset == 0)
-		ret = try_to_release_page(page,0);
+	if (offset == 0) {
+		BUG_ON(!PageLocked(page));
+
+		ret = 0;
+		if (!PageWriteback(page))
+			ret = page->mapping->a_ops->releasepage(page, 0);
+	}
+
 out:
 	_leave(" = %d",ret);
 	return ret;

Index: aops.c
===================================================================
RCS file: /home/cvs/afs/fs/cachefs/aops.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- aops.c	11 Jun 2003 11:59:52 -0000	1.37
+++ aops.c	1 Jul 2003 17:44:50 -0000	1.38
@@ -837,7 +837,12 @@
 	 */
 	if (offset == 0) {
 		dbgpgfree(page);
-		ret = try_to_release_page(page,0);
+
+		BUG_ON(!PageLocked(page));
+
+		ret = 0;
+		if (!PageWriteback(page))
+			ret = page->mapping->a_ops->releasepage(page, 0);
 	}
 out:
 	_leave(" = %d",ret);