GIT: unionfs2-2.6.27.y: tmpfs: handle MPOL_LOCAL mount option properly

[Erez Zadok]

commit 7ec7aa7a91a38a36b392059e7307e09d0136d1e4
Author: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Date:   Tue Mar 23 13:35:31 2010 -0700

    tmpfs: handle MPOL_LOCAL mount option properly
    
    commit 12821f5fb942e795f8009ece14bde868893bd811 upstream.
    
    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 at jp.fujitsu.com>
    Cc: Ravikiran Thirumalai <kiran at scalex86.org>
    Cc: Christoph Lameter <cl at linux-foundation.org>
    Cc: Mel Gorman <mel at csn.ul.ie>
    Acked-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
    Cc: Hugh Dickins <hugh.dickins at tiscali.co.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index b62bf1d..b9abde7 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -2048,6 +2048,7 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
 		if (nodelist)
 			goto out;
 		mode = MPOL_PREFERRED;
+		err = 0;
 		break;
 	case MPOL_DEFAULT:
 		/*