path: root/ipc/shm.c
diff options
authorLee Schermerhorn <lee.schermerhorn@hp.com>2008-04-28 02:13:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 08:58:24 -0700
commitae4d8c16aa22775f5731677abb8a82f03cec877e (patch)
tree2d34c6fd334b51cc5f3265cd4ec26db758639b5c /ipc/shm.c
parentf4e53d910b7dde2685b177f1e7c3e3e0b4a42f7b (diff)
mempolicy: fixup Fallback for Default Shmem Policy
get_vma_policy() is not handling fallback to task policy correctly when the get_policy() vm_op returns NULL. The NULL overwrites the 'pol' variable that was holding the fallback task mempolicy. So, it was falling back directly to system default policy. Fix get_vma_policy() to use only non-NULL policy returned from the vma get_policy op. shm_get_policy() was falling back to current task's mempolicy if the "backing file system" [tmpfs vs hugetlbfs] does not support the get_policy vm_op and the vma policy is null. This is incorrect for show_numa_maps() which is likely querying the numa_maps of some task other than current. Remove this fallback. Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com> Cc: Christoph Lameter <clameter@sgi.com> Cc: David Rientjes <rientjes@google.com> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc/shm.c')
1 files changed, 1 insertions, 2 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index cc63fae02f06..8d1b2c468cc4 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -274,8 +274,7 @@ static struct mempolicy *shm_get_policy(struct vm_area_struct *vma,
else if (vma->vm_policy) {
pol = vma->vm_policy;
mpol_get(pol); /* get_vma_policy() expects this */
- } else
- pol = current->mempolicy;
+ }
return pol;