diff --git a/[refs] b/[refs]
index f919fd9d2af4..53e0aa65001e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c61284e99191b2284fb74dae6961d4d09e4e59e8
+refs/heads/master: a6aa62a0909b9ccb1f8b0d2653920ba071037972
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 199fa436c0dd..b94fe1b3da43 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -298,7 +298,7 @@ static int may_write_to_queue(struct backing_dev_info *bdi)
 static void handle_write_error(struct address_space *mapping,
 				struct page *page, int error)
 {
-	lock_page(page);
+	lock_page_nosync(page);
 	if (page_mapping(page) == mapping)
 		mapping_set_error(mapping, error);
 	unlock_page(page);