mm/swapfile.c: call free_swap_slot() in __swap_entry_free()
[muen/linux.git] / mm / swapfile.c
index 0d44179213ed0cbf96923b53c505f949ff3090f6..eaa5e2e55cabecd344263e6ea8839917ac2b9eeb 100644 (file)
@@ -1182,6 +1182,8 @@ static unsigned char __swap_entry_free(struct swap_info_struct *p,
        ci = lock_cluster_or_swap_info(p, offset);
        usage = __swap_entry_free_locked(p, offset, usage);
        unlock_cluster_or_swap_info(p, ci);
+       if (!usage)
+               free_swap_slot(entry);
 
        return usage;
 }
@@ -1212,10 +1214,8 @@ void swap_free(swp_entry_t entry)
        struct swap_info_struct *p;
 
        p = _swap_info_get(entry);
-       if (p) {
-               if (!__swap_entry_free(p, entry, 1))
-                       free_swap_slot(entry);
-       }
+       if (p)
+               __swap_entry_free(p, entry, 1);
 }
 
 /*
@@ -1637,8 +1637,6 @@ int free_swap_and_cache(swp_entry_t entry)
                    !swap_page_trans_huge_swapped(p, entry))
                        __try_to_reclaim_swap(p, swp_offset(entry),
                                              TTRS_UNMAPPED | TTRS_FULL);
-               else if (!count)
-                       free_swap_slot(entry);
        }
        return p != NULL;
 }