Commit:     22741925d268e8479ef66312749bd8d96ed35365
Parent:     74584ae509befc2ed711810e7df4b075473869b2
Author:     Adam Litke <[EMAIL PROTECTED]>
AuthorDate: Sat Jun 16 10:16:15 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sat Jun 16 13:16:16 2007 -0700

    hugetlb: fix get_policy for stacked shared memory files
    Here's another breakage as a result of shared memory stacked files :(
    The NUMA policy for a VMA is determined by checking the following (in the
    order given):
    1) vma->vm_ops->get_policy() (if defined)
    2) vma->vm_policy (if defined)
    3) task->mempolicy (if defined)
    4) Fall back to default_policy
    By switching to stacked files for shared memory, get_policy() is now always
    set to shm_get_policy which is a wrapper function.  This causes us to stop
    at step 1, which yields NULL for hugetlb instead of task->mempolicy which
    was the previous (and correct) result.
    This patch modifies the shm_get_policy() wrapper to maintain steps 1-3 for
    the wrapped vm_ops.
    (akpm: the refcounting of mempolicies is busted and this patch does nothing 
    improve it)
    Signed-off-by: Adam Litke <[EMAIL PROTECTED]>
    Acked-by: William Irwin <[EMAIL PROTECTED]>
    Cc: dean gaudet <[EMAIL PROTECTED]>
    Cc: Christoph Lameter <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 ipc/shm.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ipc/shm.c b/ipc/shm.c
index 02faa54..047b823 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -254,8 +254,10 @@ struct mempolicy *shm_get_policy(struct vm_area_struct 
*vma, unsigned long addr)
        if (sfd->vm_ops->get_policy)
                pol = sfd->vm_ops->get_policy(vma, addr);
-       else
+       else if (vma->vm_policy)
                pol = vma->vm_policy;
+       else
+               pol = current->mempolicy;
        return pol;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to