--- mm/swapfile.c

+++ mm/swapfile.c

@@ -289,7 +289,7 @@ checks:

scan_base = offset = si->lowest_bit;

/* reuse swap entry of cache-only swap if not busy. */

- if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) {

+ if (si->swap_map[offset] == SWAP_HAS_CACHE) {

int swap_was_freed;

spin_unlock(&swap_lock);

swap_was_freed = __try_to_reclaim_swap(si, offset);

@@ -378,7 +378,7 @@ scan:

spin_lock(&swap_lock);

goto checks;

}

- if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) {

+ if (si->swap_map[offset] == SWAP_HAS_CACHE) {

spin_lock(&swap_lock);

goto checks;

}

@@ -393,7 +393,7 @@ scan:

spin_lock(&swap_lock);

goto checks;

}

- if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) {

+ if (si->swap_map[offset] == SWAP_HAS_CACHE) {

spin_lock(&swap_lock);

goto checks;

}

@@ -707,8 +707,7 @@ int free_swap_and_cache(swp_entry_t entr

* Not mapped elsewhere, or swap space full? Free it!

* Also recheck PageSwapCache now page is locked (above).

*/

- if (PageSwapCache(page) && !PageWriteback(page) &&

- (!page_mapped(page) || vm_swap_full())) {

+ if (PageSwapCache(page) && !PageWriteback(page)) {

delete_from_swap_cache(page);

SetPageDirty(page);

}