X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mm%2Fshmem.c;h=b6aae2b33393d96d694145326c6591acf6f83b4b;hb=c8681f14013d3ad2fc4fb4e30cfd4ea548f7a249;hp=b2a35ebf071a2162dcfd32896c18970b9a8af322;hpb=efab03d998da03f67836ffc664b04e0400f85448;p=powerpc.git

diff --git a/mm/shmem.c b/mm/shmem.c
index b2a35ebf07..b6aae2b333 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -967,6 +967,8 @@ static inline int shmem_parse_mpol(char *value, int *policy, nodemask_t *policy_
 		*nodelist++ = '\0';
 		if (nodelist_parse(nodelist, *policy_nodes))
 			goto out;
+		if (!nodes_subset(*policy_nodes, node_online_map))
+			goto out;
 	}
 	if (!strcmp(value, "default")) {
 		*policy = MPOL_DEFAULT;
@@ -2358,14 +2360,11 @@ static void init_once(void *foo, struct kmem_cache *cachep,
 {
 	struct shmem_inode_info *p = (struct shmem_inode_info *) foo;
 
-	if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
-	    SLAB_CTOR_CONSTRUCTOR) {
-		inode_init_once(&p->vfs_inode);
+	inode_init_once(&p->vfs_inode);
 #ifdef CONFIG_TMPFS_POSIX_ACL
-		p->i_acl = NULL;
-		p->i_default_acl = NULL;
+	p->i_acl = NULL;
+	p->i_default_acl = NULL;
 #endif
-	}
 }
 
 static int init_inodecache(void)