diff --git a/[refs] b/[refs]
index 03885a5d0a7d..fc5add2d0914 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2687a3569e40b1302f96698bcd6329aeb0ce3dd2
+refs/heads/master: 0b94e97a25d9b06ef17fca8da23169200bead1e2
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index ac8f690d2885..455119cc7f40 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -982,7 +982,8 @@ void do_generic_mapping_read(struct address_space *mapping,
 
 page_not_up_to_date:
 		/* Get exclusive access to the page ... */
-		lock_page(page);
+		if (lock_page_killable(page))
+			goto readpage_eio;
 
 		/* Did it get truncated before we got the lock? */
 		if (!page->mapping) {
@@ -1010,7 +1011,8 @@ void do_generic_mapping_read(struct address_space *mapping,
 		}
 
 		if (!PageUptodate(page)) {
-			lock_page(page);
+			if (lock_page_killable(page))
+				goto readpage_eio;
 			if (!PageUptodate(page)) {
 				if (page->mapping == NULL) {
 					/*
@@ -1021,15 +1023,16 @@ void do_generic_mapping_read(struct address_space *mapping,
 					goto find_page;
 				}
 				unlock_page(page);
-				error = -EIO;
 				shrink_readahead_size_eio(filp, ra);
-				goto readpage_error;
+				goto readpage_eio;
 			}
 			unlock_page(page);
 		}
 
 		goto page_ok;
 
+readpage_eio:
+		error = -EIO;
 readpage_error:
 		/* UHHUH! A synchronous read error occurred. Report it */
 		desc->error = error;