diff --git a/[refs] b/[refs]
index d2c93d38e974..dc96c8419fdc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c691b9d983d7015d54057034f4cd9b6d8affd976
+refs/heads/master: c3f0da631539b3b8e17f6dda567af9958d49d14f
diff --git a/trunk/mm/page-writeback.c b/trunk/mm/page-writeback.c
index b5d8a1f820a0..28763b8bdbdd 100644
--- a/trunk/mm/page-writeback.c
+++ b/trunk/mm/page-writeback.c
@@ -1103,7 +1103,7 @@ EXPORT_SYMBOL(write_one_page);
 int __set_page_dirty_no_writeback(struct page *page)
 {
 	if (!PageDirty(page))
-		SetPageDirty(page);
+		return !TestSetPageDirty(page);
 	return 0;
 }