---

yaml --- r: 332354 b: refs/heads/master c: 00442ad h: refs/heads/master v: v3
git-mirror · Oct 9, 2012 · 48bccae · 48bccae
1 parent 891b138
commit 48bccae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63f74ca21f1fad36d075e063f06dcc6d39fe86b2
+refs/heads/master: 00442ad04a5eac08a98255697c510e708f6082e2
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
@@ -1552,8 +1552,18 @@ struct mempolicy *get_vma_policy(struct task_struct *task,
 									addr);
 			if (vpol)
 				pol = vpol;
-		} else if (vma->vm_policy)
+		} else if (vma->vm_policy) {
 			pol = vma->vm_policy;
+
+			/*
+			 * shmem_alloc_page() passes MPOL_F_SHARED policy with
+			 * a pseudo vma whose vma->vm_ops=NULL. Take a reference
+			 * count on these policies which will be dropped by
+			 * mpol_cond_put() later
+			 */
+			if (mpol_needs_cond_ref(pol))
+				mpol_get(pol);
+		}
 	}
 	if (!pol)
 		pol = &default_policy;