diff options
author | KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> | 2010-03-23 16:35:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 19:31:21 -0400 |
commit | 12821f5fb942e795f8009ece14bde868893bd811 (patch) | |
tree | 6b83232e845bf8427d7ad313ac31aa910ff6d1f7 /mm/mempolicy.c | |
parent | d69b2e63e9172afb4d07c305601b79a55509ac4c (diff) |
tmpfs: handle MPOL_LOCAL mount option properly
commit 71fe804b6d5 (mempolicy: use struct mempolicy pointer in
shmem_sb_info) added mpol=local mount option. but its feature is broken
since it was born. because such code always return 1 (i.e. mount
failure).
This patch fixes it.
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>
Diffstat (limited to 'mm/mempolicy.c')
-rw-r--r-- | mm/mempolicy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 10db44f95749..fb71790398f0 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
@@ -2214,6 +2214,7 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context) | |||
2214 | if (nodelist) | 2214 | if (nodelist) |
2215 | goto out; | 2215 | goto out; |
2216 | mode = MPOL_PREFERRED; | 2216 | mode = MPOL_PREFERRED; |
2217 | err = 0; | ||
2217 | break; | 2218 | break; |
2218 | case MPOL_DEFAULT: | 2219 | case MPOL_DEFAULT: |
2219 | /* | 2220 | /* |