aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>2010-03-23 16:35:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-24 19:31:21 -0400
commitd69b2e63e9172afb4d07c305601b79a55509ac4c (patch)
treeb1abae07eaa3427dedca17427100664cdccf8a38
parent413b43deab8377819aba1dbad2abf0c15d59b491 (diff)
tmpfs: mpol=bind:0 don't cause mount error.
Currently, following mount operation cause mount error. % mount -t tmpfs -ompol=bind:0 none /tmp Because commit 71fe804b6d5 (mempolicy: use struct mempolicy pointer in shmem_sb_info) corrupted MPOL_BIND parse code. This patch restore the needed one. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Ravikiran Thirumalai <kiran@scalex86.org> Cc: Christoph Lameter <cl@linux-foundation.org> Cc: Mel Gorman <mel@csn.ul.ie> Acked-by: Lee Schermerhorn <lee.schermerhorn@hp.com> Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/mempolicy.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 745ce90308a6..10db44f95749 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -2222,9 +2222,13 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
2222 if (!nodelist) 2222 if (!nodelist)
2223 err = 0; 2223 err = 0;
2224 goto out; 2224 goto out;
2225 /* 2225 case MPOL_BIND:
2226 * case MPOL_BIND: mpol_new() enforces non-empty nodemask. 2226 /*
2227 */ 2227 * Insist on a nodelist
2228 */
2229 if (!nodelist)
2230 goto out;
2231 err = 0;
2228 } 2232 }
2229 2233
2230 mode_flags = 0; 2234 mode_flags = 0;