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

Commit 212a0a6f authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds
Browse files

mm, mempolicy: remove duplicate code 



Remove some duplicate code and simplify alloc_pages_vma().  No functional
change.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6f6313d4

mm/mempolicy.c

+4 −17
Original line number Diff line number Diff line
@@ -1907,7 +1907,6 @@ alloc_pages_vma(gfp_t gfp, int order, struct vm_area_struct *vma, 
		unsigned long addr, int node)

{

	struct mempolicy *pol;

	struct zonelist *zl;

	struct page *page;

	unsigned int cpuset_mems_cookie;
@@ -1926,23 +1925,11 @@ alloc_pages_vma(gfp_t gfp, int order, struct vm_area_struct *vma, 


		return page;

	}

	zl = policy_zonelist(gfp, pol, node);

	if (unlikely(mpol_needs_cond_ref(pol))) {

		/*

		 * slow path: ref counted shared policy

		 */

		struct page *page =  __alloc_pages_nodemask(gfp, order,

						zl, policy_nodemask(gfp, pol));

		__mpol_put(pol);

		if (unlikely(!put_mems_allowed(cpuset_mems_cookie) && !page))

			goto retry_cpuset;

		return page;

	}

	/*

	 * fast path:  default or task policy

	 */

	page = __alloc_pages_nodemask(gfp, order, zl,

	page = __alloc_pages_nodemask(gfp, order,

				      policy_zonelist(gfp, pol, node),

				      policy_nodemask(gfp, pol));

	if (unlikely(mpol_needs_cond_ref(pol)))

		__mpol_put(pol);

	if (unlikely(!put_mems_allowed(cpuset_mems_cookie) && !page))

		goto retry_cpuset;

	return page;