1 files changed, 10 insertions, 0 deletions

diff --git a/mm/z3fold.c b/mm/z3fold.c
index 70008a8fed95..6c72b18d8b9c 100644
--- a/mm/z3fold.c
+++ b/mm/z3fold.c
@@ -1357,12 +1357,22 @@ static int z3fold_page_migrate(struct address_space *mapping, struct page *newpa
                 z3fold_page_unlock(zhdr);
                 return -EBUSY;
         }
+        if (work_pending(&zhdr->work)) {
+                z3fold_page_unlock(zhdr);
+                return -EAGAIN;
+        }
         new_zhdr = page_address(newpage);
         memcpy(new_zhdr, zhdr, PAGE_SIZE);
         newpage->private = page->private;
         page->private = 0;
         z3fold_page_unlock(zhdr);
         spin_lock_init(&new_zhdr->page_lock);
+        INIT_WORK(&new_zhdr->work, compact_page_work);
+        /*
+         * z3fold_page_isolate() ensures that new_zhdr->buddy is empty,
+         * so we only have to reinitialize it.
+         */
+        INIT_LIST_HEAD(&new_zhdr->buddy);
         new_mapping = page_mapping(page);
         __ClearPageMovable(page);
         ClearPagePrivate(page);