mm/mmu_notifier: convert user range->blockable to helper function

[sfrench/cifs-2.6.git] / drivers / infiniband / core / umem_odp.c

diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/umem_odp.c
index 97219143f16f69a7d10a403406bdfffad0ce925a..f962b5bbfa40e4268de37f99c78b6653895c9599 100644 (file)
--- a/drivers/infiniband/core/umem_odp.c
+++ b/drivers/infiniband/core/umem_odp.c
@@ -152,7 +152,7 @@ static int ib_umem_notifier_invalidate_range_start(struct mmu_notifier *mn,
        struct ib_ucontext_per_mm *per_mm =
                container_of(mn, struct ib_ucontext_per_mm, mn);
 
-       if (range->blockable)
+       if (mmu_notifier_range_blockable(range))
                down_read(&per_mm->umem_rwsem);
        else if (!down_read_trylock(&per_mm->umem_rwsem))
                return -EAGAIN;
@@ -170,7 +170,8 @@ static int ib_umem_notifier_invalidate_range_start(struct mmu_notifier *mn,
        return rbt_ib_umem_for_each_in_range(&per_mm->umem_tree, range->start,
                                             range->end,
                                             invalidate_range_start_trampoline,
-                                            range->blockable, NULL);
+                                            mmu_notifier_range_blockable(range),
+                                            NULL);
 }
 
 static int invalidate_range_end_trampoline(struct ib_umem_odp *item, u64 start,
@@ -417,9 +418,6 @@ int ib_umem_odp_get(struct ib_umem_odp *umem_odp, int access)
                h = hstate_vma(vma);
                umem->page_shift = huge_page_shift(h);
                up_read(&mm->mmap_sem);
-               umem->hugetlb = 1;
-       } else {
-               umem->hugetlb = 0;
        }
 
        mutex_init(&umem_odp->umem_mutex);