diff options
| author | Yishai Hadas <yishaih@mellanox.com> | 2012-05-10 23:28:05 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-05-31 00:43:25 +0100 |
| commit | d704f9240928c3ca88ea166c5175a9c66ea48564 (patch) | |
| tree | bdd27ed34e4c589eeb3c7d1f27aa3550a133d2f2 /drivers/infiniband | |
| parent | 215c55abf9534e37ab8971d6e70e4ba8bf59e985 (diff) | |
| download | kernel_samsung_smdk4412-d704f9240928c3ca88ea166c5175a9c66ea48564.zip kernel_samsung_smdk4412-d704f9240928c3ca88ea166c5175a9c66ea48564.tar.gz kernel_samsung_smdk4412-d704f9240928c3ca88ea166c5175a9c66ea48564.tar.bz2 | |
IB/core: Fix mismatch between locked and pinned pages
commit c4870eb874ac16dccef40e1bc7a002c7e9156adc upstream.
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>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/core/umem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index 71f0c0f..a841123 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); |