Merge tag 'nfs-for-4.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux.git] / include / rdma / ib_umem.h

diff --git a/include/rdma/ib_umem.h b/include/rdma/ib_umem.h
index a1fd63871d17289ee61ac1e22e7f2aeed42d82cf..5d3755ec5afaf7f307e32f424c53d14e328ce1b4 100644 (file)
--- a/include/rdma/ib_umem.h
+++ b/include/rdma/ib_umem.h
@@ -42,15 +42,14 @@ struct ib_umem_odp;
 
 struct ib_umem {
        struct ib_ucontext     *context;
+       struct mm_struct       *owning_mm;
        size_t                  length;
        unsigned long           address;
        int                     page_shift;
-       int                     writable;
-       int                     hugetlb;
+       u32 writable : 1;
+       u32 hugetlb : 1;
+       u32 is_odp : 1;
        struct work_struct      work;
-       struct mm_struct       *mm;
-       unsigned long           diff;
-       struct ib_umem_odp     *odp_data;
        struct sg_table sg_head;
        int             nmap;
        int             npages;