Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 128ec037 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

thp: do_huge_pmd_anonymous_page() cleanup 



Minor cleanup: unindent most code of the fucntion by inverting one
condition.  It's preparation for the next patch.

No functional changes.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: default avatarHillf Danton <dhillf@gmail.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Hugh Dickins <hughd@google.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3122359a

mm/huge_memory.c

+41 −42
Original line number Diff line number Diff line
@@ -785,7 +785,8 @@ int do_huge_pmd_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, 
	unsigned long haddr = address & HPAGE_PMD_MASK;

	pte_t *pte;



	if (haddr >= vma->vm_start && haddr + HPAGE_PMD_SIZE <= vma->vm_end) {

	if (haddr < vma->vm_start || haddr + HPAGE_PMD_SIZE > vma->vm_end)

		goto out;

	if (unlikely(anon_vma_prepare(vma)))

		return VM_FAULT_OOM;

	if (unlikely(khugepaged_enter(vma)))
@@ -825,15 +826,13 @@ int do_huge_pmd_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, 
		put_page(page);

		goto out;

	}

		if (unlikely(__do_huge_pmd_anonymous_page(mm, vma, haddr, pmd,

							  page))) {

	if (unlikely(__do_huge_pmd_anonymous_page(mm, vma, haddr, pmd, page))) {

		mem_cgroup_uncharge_page(page);

		put_page(page);

		goto out;

	}



	return 0;

	}

out:

	/*

	 * Use __pte_alloc instead of pte_alloc_map, because we can't