1 files changed, 10 insertions, 11 deletions

diff --git a/mm/migrate.c b/mm/migrate.c
index 2cff57e7116e..962cb62c621f 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -767,12 +767,12 @@ recheck_buffers:
                         }
                         bh = bh->b_this_page;
                 } while (bh != head);
-                spin_unlock(&mapping->private_lock);
                 if (busy) {
                         if (invalidated) {
                                 rc = -EAGAIN;
                                 goto unlock_buffers;
                         }
+                        spin_unlock(&mapping->private_lock);
                         invalidate_bh_lrus();
                         invalidated = true;
                         goto recheck_buffers;
@@ -805,6 +805,8 @@ recheck_buffers:
 
         rc = MIGRATEPAGE_SUCCESS;
 unlock_buffers:
+        if (check_refs)
+                spin_unlock(&mapping->private_lock);
         bh = head;
         do {
                 unlock_buffer(bh);
@@ -2328,16 +2330,13 @@ next:
 static void migrate_vma_collect(struct migrate_vma *migrate)
 {
         struct mmu_notifier_range range;
-        struct mm_walk mm_walk;
-
-        mm_walk.pmd_entry = migrate_vma_collect_pmd;
-        mm_walk.pte_entry = NULL;
-        mm_walk.pte_hole = migrate_vma_collect_hole;
-        mm_walk.hugetlb_entry = NULL;
-        mm_walk.test_walk = NULL;
-        mm_walk.vma = migrate->vma;
-        mm_walk.mm = migrate->vma->vm_mm;
-        mm_walk.private = migrate;
+        struct mm_walk mm_walk = {
+                .pmd_entry = migrate_vma_collect_pmd,
+                .pte_hole = migrate_vma_collect_hole,
+                .vma = migrate->vma,
+                .mm = migrate->vma->vm_mm,
+                .private = migrate,
+        };
 
         mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, NULL, mm_walk.mm,
                                 migrate->start,