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

Commit 15d77835 authored by Lee Schermerhorn's avatar Lee Schermerhorn Committed by Linus Torvalds
Browse files

mempolicy: factor mpol_shared_policy_init() return paths 



Factor out duplicate put/frees in mpol_shared_policy_init() to a common
return path.

Signed-off-by: default avatarLee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: Ravikiran Thirumalai <kiran@scalex86.org>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 345ace9c

mm/mempolicy.c

+6 −10
Original line number Diff line number Diff line
@@ -1995,26 +1995,22 @@ void mpol_shared_policy_init(struct shared_policy *sp, struct mempolicy *mpol) 
			return;

		/* contextualize the tmpfs mount point mempolicy */

		new = mpol_new(mpol->mode, mpol->flags, &mpol->w.user_nodemask);

		if (IS_ERR(new)) {

			mpol_put(mpol);	/* drop our ref on sb mpol */

			NODEMASK_SCRATCH_FREE(scratch);

			return;		/* no valid nodemask intersection */

		}

		if (IS_ERR(new))

			goto put_free; /* no valid nodemask intersection */



		task_lock(current);

		ret = mpol_set_nodemask(new, &mpol->w.user_nodemask, scratch);

		task_unlock(current);

		mpol_put(mpol);	/* drop our ref on sb mpol */

		if (ret) {

			NODEMASK_SCRATCH_FREE(scratch);

			mpol_put(new);

			return;

		}

		if (ret)

			goto put_free;



		/* Create pseudo-vma that contains just the policy */

		memset(&pvma, 0, sizeof(struct vm_area_struct));

		pvma.vm_end = TASK_SIZE;	/* policy covers entire file */

		mpol_set_shared_policy(sp, &pvma, new); /* adds ref */



put_free:

		mpol_put(new);			/* drop initial ref */

		NODEMASK_SCRATCH_FREE(scratch);

	}