From d3a7daab57682cb1631fbd3052d40005bd0b394b Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 25 May 2010 23:42:58 -0700 Subject: [PATCH] --- yaml --- r: 198629 b: refs/heads/master c: 0cae3457b1a6e88f31020272bcfd90c178716053 h: refs/heads/master i: 198627: 95d831b92c68efa98202e896a7c5e93c6fe97ccb v: v3 --- [refs] | 2 +- trunk/mm/mempolicy.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0418f7dbf576..dde03b716c62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1cdc4670b9508fcd47a15fbd12f70d269880b37 +refs/heads/master: 0cae3457b1a6e88f31020272bcfd90c178716053 diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c index 75751012c552..5d6fb339de03 100644 --- a/trunk/mm/mempolicy.c +++ b/trunk/mm/mempolicy.c @@ -2098,7 +2098,7 @@ void mpol_shared_policy_init(struct shared_policy *sp, struct mempolicy *mpol) /* contextualize the tmpfs mount point mempolicy */ new = mpol_new(mpol->mode, mpol->flags, &mpol->w.user_nodemask); if (IS_ERR(new)) - goto put_free; /* no valid nodemask intersection */ + goto free_scratch; /* no valid nodemask intersection */ task_lock(current); ret = mpol_set_nodemask(new, &mpol->w.user_nodemask, scratch); @@ -2114,6 +2114,7 @@ void mpol_shared_policy_init(struct shared_policy *sp, struct mempolicy *mpol) put_free: mpol_put(new); /* drop initial ref */ +free_scratch: NODEMASK_SCRATCH_FREE(scratch); } }