From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 17 Oct 2007 06:26:02 +0000 (-0700)
Subject: writeback: don't propagate AOP_WRITEPAGE_ACTIVATE
X-Git-Tag: v2.6.24-rc1~782
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e423003028183df54f039dfda8b58c49e78c89d7;p=linux-2.6-omap-h63xx.git

writeback: don't propagate AOP_WRITEPAGE_ACTIVATE

This is a writeback-internal marker but we're propagating it all the way back
to userspace!.

Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 4073d531cd7..33485213158 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -849,8 +849,10 @@ retry:
 
 			ret = (*writepage)(page, wbc, data);
 
-			if (unlikely(ret == AOP_WRITEPAGE_ACTIVATE))
+			if (unlikely(ret == AOP_WRITEPAGE_ACTIVATE)) {
 				unlock_page(page);
+				ret = 0;
+			}
 			if (ret || (--(wbc->nr_to_write) <= 0))
 				done = 1;
 			if (wbc->nonblocking && bdi_write_congested(bdi)) {