Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / lustre / lnet / lnet / router.c

diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c
index 063543233035c599e395407d7b964b02e952a3b3..69819c93fc0b1d5bbef186eef0bb8a204cb140b3 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/router.c
+++ b/drivers/staging/lustre/lnet/lnet/router.c
@@ -1307,7 +1307,7 @@ lnet_destroy_rtrbuf(lnet_rtrbuf_t *rb, int npages)
        int sz = offsetof(lnet_rtrbuf_t, rb_kiov[npages]);
 
        while (--npages >= 0)
-               __free_page(rb->rb_kiov[npages].kiov_page);
+               __free_page(rb->rb_kiov[npages].bv_page);
 
        LIBCFS_FREE(rb, sz);
 }
@@ -1333,15 +1333,15 @@ lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp, int cpt)
                                GFP_KERNEL | __GFP_ZERO, 0);
                if (!page) {
                        while (--i >= 0)
-                               __free_page(rb->rb_kiov[i].kiov_page);
+                               __free_page(rb->rb_kiov[i].bv_page);
 
                        LIBCFS_FREE(rb, sz);
                        return NULL;
                }
 
-               rb->rb_kiov[i].kiov_len = PAGE_SIZE;
-               rb->rb_kiov[i].kiov_offset = 0;
-               rb->rb_kiov[i].kiov_page = page;
+               rb->rb_kiov[i].bv_len = PAGE_SIZE;
+               rb->rb_kiov[i].bv_offset = 0;
+               rb->rb_kiov[i].bv_page = page;
        }
 
        return rb;