summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYishai Hadas <yishaih@mellanox.com>2012-05-10 22:28:05 +0200
committerRoland Dreier <roland@purestorage.com>2012-05-11 20:38:22 +0200
commitc4870eb874ac16dccef40e1bc7a002c7e9156adc (patch)
tree111be5cae7c0180f6e15a06b83dca96da5155491
parentIB/core: Use qp->usecnt to track multicast attach/detach (diff)
downloadlinux-c4870eb874ac16dccef40e1bc7a002c7e9156adc.tar.xz
linux-c4870eb874ac16dccef40e1bc7a002c7e9156adc.zip
IB/core: Fix mismatch between locked and pinned pages
Commit bc3e53f682d9 ("mm: distinguish between mlocked and pinned pages") introduced a separate counter for pinned pages and used it in the IB stack. However, in ib_umem_get() the pinned counter is incremented, but ib_umem_release() wrongly decrements the locked counter. Fix this. Signed-off-by: Yishai Hadas <yishaih@mellanox.com> Reviewed-by: Christoph Lameter <cl@linux.com> Cc: <stable@vger.kernel.org> Signed-off-by: Roland Dreier <roland@purestorage.com>
-rw-r--r--drivers/infiniband/core/umem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index 71f0c0f7df94..a84112322071 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -269,7 +269,7 @@ void ib_umem_release(struct ib_umem *umem)
} else
down_write(&mm->mmap_sem);
- current->mm->locked_vm -= diff;
+ current->mm->pinned_vm -= diff;
up_write(&mm->mmap_sem);
mmput(mm);
kfree(umem);