diff options
| author | Christoph Lameter <clameter@sgi.com> | 2006-06-23 02:03:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 07:42:46 -0700 |
| commit | 3c5a87f476bed45616e7e543dcaea4440c77bf93 (patch) | |
| tree | 0ff4c86ef594f7bfad9937095b69aab5e70b4174 | |
| parent | 4776874ff096cd410382c0eca5d75f69c9dfa58f (diff) | |
| download | kernel-common-3c5a87f476bed45616e7e543dcaea4440c77bf93.tar.gz kernel-common-3c5a87f476bed45616e7e543dcaea4440c77bf93.tar.bz2 kernel-common-3c5a87f476bed45616e7e543dcaea4440c77bf93.zip | |
[PATCH] migration: remove unnecessary PageSwapCache checks
Remove two unnecessary PageSwapCache checks. The page refcount is raised
and therefore page migration cannot occur in both functions.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | mm/shmem.c | 8 | ||||
| -rw-r--r-- | mm/swapfile.c | 7 |
2 files changed, 0 insertions, 15 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 10020d8b4073..84b5cf9b63c5 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1081,14 +1081,6 @@ repeat: 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/mm/swapfile.c b/mm/swapfile.c index e5fd5385f0cc..47a6812f5f8c 100644 --- a/mm/swapfile.c +++ b/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 @@ again: 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); /* |