From 14adcd27a7ff590e1c6ab9e29fd767096a8cdabc Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Tue, 20 Jul 2010 13:24:25 -0700
Subject: [PATCH] --- yaml --- r: 201063 b: refs/heads/master c:
 a6aa62a0909b9ccb1f8b0d2653920ba071037972 h: refs/heads/master i:   201061:
 cd228db3fd4578b2274afe4d8b6474e4179e8bb3   201059:
 263809ea2bf54012425d1416ddef398a7c3ca8e2   201055:
 e0aaab7581e6a6f97cee22ee6f794e580c3fbc38 v: v3

---
 [refs]            | 2 +-
 trunk/mm/vmscan.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);