lkml.org 
[lkml]   [2020]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/3] mm/migrate: clean up some minor coding style
    Date
    Fix some comment typos and coding style clean up in preparation for the
    next patch. No functional changes.

    Signed-off-by: Ralph Campbell <rcampbell@nvidia.com>
    ---
    mm/migrate.c | 34 +++++++++++++---------------------
    1 file changed, 13 insertions(+), 21 deletions(-)

    diff --git a/mm/migrate.c b/mm/migrate.c
    index b7f5d9ada429..4b1a6d69afb5 100644
    --- a/mm/migrate.c
    +++ b/mm/migrate.c
    @@ -986,7 +986,7 @@ static int move_to_new_page(struct page *newpage, struct page *page,
    }

    /*
    - * Anonymous and movable page->mapping will be cleard by
    + * Anonymous and movable page->mapping will be cleared by
    * free_pages_prepare so don't reset it here for keeping
    * the type to work PageAnon, for example.
    */
    @@ -1199,8 +1199,7 @@ static ICE_noinline int unmap_and_move(new_page_t get_new_page,
    /*
    * A page that has been migrated has all references
    * removed and will be freed. A page that has not been
    - * migrated will have kepts its references and be
    - * restored.
    + * migrated will have kept its references and be restored.
    */
    list_del(&page->lru);

    @@ -2759,27 +2758,18 @@ static void migrate_vma_insert_page(struct migrate_vma *migrate,
    if (pte_present(*ptep)) {
    unsigned long pfn = pte_pfn(*ptep);

    - if (!is_zero_pfn(pfn)) {
    - pte_unmap_unlock(ptep, ptl);
    - mem_cgroup_cancel_charge(page, memcg, false);
    - goto abort;
    - }
    + if (!is_zero_pfn(pfn))
    + goto unlock_abort;
    flush = true;
    - } else if (!pte_none(*ptep)) {
    - pte_unmap_unlock(ptep, ptl);
    - mem_cgroup_cancel_charge(page, memcg, false);
    - goto abort;
    - }
    + } else if (!pte_none(*ptep))
    + goto unlock_abort;

    /*
    - * Check for usefaultfd but do not deliver the fault. Instead,
    + * Check for userfaultfd but do not deliver the fault. Instead,
    * just back off.
    */
    - if (userfaultfd_missing(vma)) {
    - pte_unmap_unlock(ptep, ptl);
    - mem_cgroup_cancel_charge(page, memcg, false);
    - goto abort;
    - }
    + if (userfaultfd_missing(vma))
    + goto unlock_abort;

    inc_mm_counter(mm, MM_ANONPAGES);
    page_add_new_anon_rmap(page, vma, addr, false);
    @@ -2803,6 +2793,9 @@ static void migrate_vma_insert_page(struct migrate_vma *migrate,
    *src = MIGRATE_PFN_MIGRATE;
    return;

    +unlock_abort:
    + pte_unmap_unlock(ptep, ptl);
    + mem_cgroup_cancel_charge(page, memcg, false);
    abort:
    *src &= ~MIGRATE_PFN_MIGRATE;
    }
    @@ -2835,9 +2828,8 @@ void migrate_vma_pages(struct migrate_vma *migrate)
    }

    if (!page) {
    - if (!(migrate->src[i] & MIGRATE_PFN_MIGRATE)) {
    + if (!(migrate->src[i] & MIGRATE_PFN_MIGRATE))
    continue;
    - }
    if (!notified) {
    notified = true;

    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-07 22:40    [W:3.509 / U:0.556 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site