diff --git a/[refs] b/[refs]
index b8c55849ce39..2dddf4507f72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8e7a54cd06b0b0174029ef3a7f5a1415a2c28f2
+refs/heads/master: ce7e9fae8db07af4080e868f4588f8f095f803dc
diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c
index dc3be5f5b0da..dbc2ca2057a5 100644
--- a/trunk/mm/rmap.c
+++ b/trunk/mm/rmap.c
@@ -471,11 +471,12 @@ int page_mkclean(struct page *page)
 
 	if (page_mapped(page)) {
 		struct address_space *mapping = page_mapping(page);
-		if (mapping)
+		if (mapping) {
 			ret = page_mkclean_file(mapping, page);
-		if (page_test_dirty(page)) {
-			page_clear_dirty(page);
-			ret = 1;
+			if (page_test_dirty(page)) {
+				page_clear_dirty(page);
+				ret = 1;
+			}
 		}
 	}