Merge branch 'kvm-guestmemfd' into HEAD

[sfrench/cifs-2.6.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index 35a88334bb3c2ffa9b641f7fc8b9abe0ee53f04d..ff0fbf95a3849f7156557eea0fc48f5574e453b9 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -955,6 +955,8 @@ static int move_to_new_folio(struct folio *dst, struct folio *src,
 
                if (!mapping)
                        rc = migrate_folio(mapping, dst, src, mode);
+               else if (mapping_unmovable(mapping))
+                       rc = -EOPNOTSUPP;
                else if (mapping->a_ops->migrate_folio)
                        /*
                         * Most folios have a mapping and most filesystems