From d5f512d0c5f8b63fcee1a174e8916ddfc30e97b4 Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Sun, 6 May 2007 14:49:16 -0700
Subject: [PATCH] --- yaml --- r: 54181 b: refs/heads/master c:
 a8127717cb24be7b8827a8d9e0ddbfde6b392146 h: refs/heads/master i:   54179:
 6a9e9d080b563959c67816172904fa8b6237dda3 v: v3

---
 [refs]             |  2 +-
 trunk/mm/filemap.c | 24 ------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index 932b556ab0bd..7835bf3e1042 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14e072984179d3d421bf9ab75cc67e0961742841
+refs/heads/master: a8127717cb24be7b8827a8d9e0ddbfde6b392146
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index 070e7547d5b5..cbea95a25283 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -1446,30 +1446,6 @@ struct page *filemap_nopage(struct vm_area_struct *area,
 		majmin = VM_FAULT_MAJOR;
 		count_vm_event(PGMAJFAULT);
 	}
-	lock_page(page);
-
-	/* Did it get unhashed while we waited for it? */
-	if (!page->mapping) {
-		unlock_page(page);
-		page_cache_release(page);
-		goto retry_all;
-	}
-
-	/* Did somebody else get it up-to-date? */
-	if (PageUptodate(page)) {
-		unlock_page(page);
-		goto success;
-	}
-
-	error = mapping->a_ops->readpage(file, page);
-	if (!error) {
-		wait_on_page_locked(page);
-		if (PageUptodate(page))
-			goto success;
-	} else if (error == AOP_TRUNCATED_PAGE) {
-		page_cache_release(page);
-		goto retry_find;
-	}
 
 	/*
 	 * Umm, take care of errors if the page isn't up-to-date.