[TCP]: Don't allow FRTO to take place while MTU is being probed

[linux-2.6-omap-h63xx.git] / ipc / shm.c

diff --git a/ipc/shm.c b/ipc/shm.c
index c47e87278a92d87acf6bdfefbb16ab73186c24b2..cc63fae02f064d298689279a46599a8159b01df1 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -271,9 +271,10 @@ static struct mempolicy *shm_get_policy(struct vm_area_struct *vma,
 
        if (sfd->vm_ops->get_policy)
                pol = sfd->vm_ops->get_policy(vma, addr);
-       else if (vma->vm_policy)
+       else if (vma->vm_policy) {
                pol = vma->vm_policy;
-       else
+               mpol_get(pol);  /* get_vma_policy() expects this */
+       } else
                pol = current->mempolicy;
        return pol;
 }