Merge tag 'vfio-v4.12-rc1' of git://github.com/awilliam/linux-vfio

[karo-tx-linux.git] / mm / swapfile.c

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 42fd620dcf4cf3fb00a68c08f5389a1067213f7c..b86b2aca3fb9b10321ea8f6770c7d10905724b2d 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -672,6 +672,9 @@ checks:
                else
                        goto done;
        }
+       si->swap_map[offset] = usage;
+       inc_cluster_info_page(si, si->cluster_info, offset);
+       unlock_cluster(ci);
 
        if (offset == si->lowest_bit)
                si->lowest_bit++;
@@ -685,9 +688,6 @@ checks:
                plist_del(&si->avail_list, &swap_avail_head);
                spin_unlock(&swap_avail_lock);
        }
-       si->swap_map[offset] = usage;
-       inc_cluster_info_page(si, si->cluster_info, offset);
-       unlock_cluster(ci);
        si->cluster_next = offset + 1;
        slots[n_ret++] = swp_entry(si->type, offset);
 
@@ -1079,8 +1079,6 @@ void swapcache_free_entries(swp_entry_t *entries, int n)
                p = swap_info_get_cont(entries[i], prev);
                if (p)
                        swap_entry_free(p, entries[i]);
-               else
-                       break;
                prev = p;
        }
        if (p)