mm-gupc-simplify-and-fix-check_and_migrate_movable_pages-return-codes-fix-fix

fix code layout, per John

Cc: Alistair Popple <apopple@nvidia.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Shigeru Yoshida <syoshida@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/gup.c b/mm/gup.c
index 542cf74c59b0d920acdf1f5e2a890fae9cf7bc28..ae84989a7d60229265cad3f75b2e0e98dcce7ce0 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2075,11 +2075,13 @@ static long __gup_longterm_locked(struct mm_struct *mm,
                                               NULL, gup_flags);
        flags = memalloc_pin_save();
        do {
-               nr_pinned_pages = __get_user_pages_locked(mm, start, nr_pages, pages, vmas,
-                                                         NULL, gup_flags);
+               nr_pinned_pages = __get_user_pages_locked(mm, start, nr_pages,
+                                                         pages, vmas, NULL,
+                                                         gup_flags);
                if (nr_pinned_pages <= 0)
                        break;
-               rc = check_and_migrate_movable_pages(nr_pinned_pages, pages, gup_flags);
+               rc = check_and_migrate_movable_pages(nr_pinned_pages, pages,
+                                                    gup_flags);
        } while (rc == -EAGAIN);
        memalloc_pin_restore(flags);