1 files changed, 7 insertions, 4 deletions

diff --git a/mm/swap_state.c b/mm/swap_state.c
index 797c3831cbec..3353c9029cef 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -33,7 +33,7 @@ static const struct address_space_operations swap_aops = {
 };
 
 static struct backing_dev_info swap_backing_dev_info = {
-        .capabilities   = BDI_CAP_NO_ACCT_AND_WRITEBACK,
+        .capabilities   = BDI_CAP_NO_ACCT_AND_WRITEBACK | BDI_CAP_SWAP_BACKED,
         .unplug_io_fn   = swap_unplug_io_fn,
 };
 
@@ -75,6 +75,7 @@ int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask)
         BUG_ON(!PageLocked(page));
         BUG_ON(PageSwapCache(page));
         BUG_ON(PagePrivate(page));
+        BUG_ON(!PageSwapBacked(page));
         error = radix_tree_preload(gfp_mask);
         if (!error) {
                 page_cache_get(page);
@@ -302,17 +303,19 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
                  * re-using the just freed swap entry for an existing page.
                  * May fail (-ENOMEM) if radix-tree node allocation failed.
                  */
-                set_page_locked(new_page);
+                __set_page_locked(new_page);
+                SetPageSwapBacked(new_page);
                 err = add_to_swap_cache(new_page, entry, gfp_mask & GFP_KERNEL);
                 if (likely(!err)) {
                         /*
                          * Initiate read into locked page and return.
                          */
-                        lru_cache_add_active(new_page);
+                        lru_cache_add_anon(new_page);
                         swap_readpage(NULL, new_page);
                         return new_page;
                 }
-                clear_page_locked(new_page);
+                ClearPageSwapBacked(new_page);
+                __clear_page_locked(new_page);
                 swap_free(entry);
         } while (err != -ENOMEM);