---

yaml --- r: 28898 b: refs/heads/master c: 3c5a87f h: refs/heads/master v: v3
git-mirror · Jun 23, 2006 · 280c6da · 280c6da
1 parent e02c298
commit 280c6da
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4776874ff096cd410382c0eca5d75f69c9dfa58f
+refs/heads/master: 3c5a87f476bed45616e7e543dcaea4440c77bf93
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
@@ -1081,14 +1081,6 @@ static int shmem_getpage(struct inode *inode, unsigned long idx,
 			page_cache_release(swappage);
 			goto repeat;
 		}
-		if (!PageSwapCache(swappage)) {
-			/* Page migration has occured */
-			shmem_swp_unmap(entry);
-			spin_unlock(&info->lock);
-			unlock_page(swappage);
-			page_cache_release(swappage);
-			goto repeat;
-		}
 		if (PageWriteback(swappage)) {
 			shmem_swp_unmap(entry);
 			spin_unlock(&info->lock);

diff --git a/trunk/mm/swapfile.c b/trunk/mm/swapfile.c
@@ -716,7 +716,6 @@ static int try_to_unuse(unsigned int type)
 		 */
 		swap_map = &si->swap_map[i];
 		entry = swp_entry(type, i);
-again:
 		page = read_swap_cache_async(entry, NULL, 0);
 		if (!page) {
 			/*
@@ -751,12 +750,6 @@ static int try_to_unuse(unsigned int type)
 		wait_on_page_locked(page);
 		wait_on_page_writeback(page);
 		lock_page(page);
-		if (!PageSwapCache(page)) {
-			/* Page migration has occured */
-			unlock_page(page);
-			page_cache_release(page);
-			goto again;
-		}
 		wait_on_page_writeback(page);
 
 		/*