diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /mm/shmem.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'mm/shmem.c')
| -rw-r--r-- | mm/shmem.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index ce501bce1c2e..f7ac7b812f92 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
| @@ -1028,6 +1028,14 @@ repeat: | |||
| 1028 | page_cache_release(swappage); | 1028 | page_cache_release(swappage); |
| 1029 | goto repeat; | 1029 | goto repeat; |
| 1030 | } | 1030 | } |
| 1031 | if (!PageSwapCache(swappage)) { | ||
| 1032 | /* Page migration has occured */ | ||
| 1033 | shmem_swp_unmap(entry); | ||
| 1034 | spin_unlock(&info->lock); | ||
| 1035 | unlock_page(swappage); | ||
| 1036 | page_cache_release(swappage); | ||
| 1037 | goto repeat; | ||
| 1038 | } | ||
| 1031 | if (PageWriteback(swappage)) { | 1039 | if (PageWriteback(swappage)) { |
| 1032 | shmem_swp_unmap(entry); | 1040 | shmem_swp_unmap(entry); |
| 1033 | spin_unlock(&info->lock); | 1041 | spin_unlock(&info->lock); |