1 files changed, 3 insertions, 0 deletions

diff --git a/mm/swap_state.c b/mm/swap_state.c
index 797c3831cbec..7a3ece0b5a3b 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -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);
@@ -303,6 +304,7 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
                  * May fail (-ENOMEM) if radix-tree node allocation failed.
                  */
                 set_page_locked(new_page);
+                SetPageSwapBacked(new_page);
                 err = add_to_swap_cache(new_page, entry, gfp_mask & GFP_KERNEL);
                 if (likely(!err)) {
                         /*
@@ -312,6 +314,7 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
                         swap_readpage(NULL, new_page);
                         return new_page;
                 }
+                ClearPageSwapBacked(new_page);
                 clear_page_locked(new_page);
                 swap_free(entry);
         } while (err != -ENOMEM);