Merge tag 'dma-mapping-6.3-2022-02-27' of git://git.infradead.org/users/hch/dma-mapping

[linux-block.git] / net / ceph / messenger_v2.c

diff --git a/net/ceph/messenger_v2.c b/net/ceph/messenger_v2.c
index 3009028c4fa28f9b12847e1d8a7cd3ef7703d790..301a991dc6a68e02f0c0fc00b7f4ada06c7f095a 100644 (file)
--- a/net/ceph/messenger_v2.c
+++ b/net/ceph/messenger_v2.c
@@ -149,10 +149,10 @@ static int do_try_sendpage(struct socket *sock, struct iov_iter *it)
 
        while (iov_iter_count(it)) {
                /* iov_iter_iovec() for ITER_BVEC */
-               bv.bv_page = it->bvec->bv_page;
-               bv.bv_offset = it->bvec->bv_offset + it->iov_offset;
-               bv.bv_len = min(iov_iter_count(it),
-                               it->bvec->bv_len - it->iov_offset);
+               bvec_set_page(&bv, it->bvec->bv_page,
+                             min(iov_iter_count(it),
+                                 it->bvec->bv_len - it->iov_offset),
+                             it->bvec->bv_offset + it->iov_offset);
 
                /*
                 * sendpage cannot properly handle pages with
@@ -286,9 +286,8 @@ static void set_out_bvec_zero(struct ceph_connection *con)
        WARN_ON(iov_iter_count(&con->v2.out_iter));
        WARN_ON(!con->v2.out_zero);
 
-       con->v2.out_bvec.bv_page = ceph_zero_page;
-       con->v2.out_bvec.bv_offset = 0;
-       con->v2.out_bvec.bv_len = min(con->v2.out_zero, (int)PAGE_SIZE);
+       bvec_set_page(&con->v2.out_bvec, ceph_zero_page,
+                     min(con->v2.out_zero, (int)PAGE_SIZE), 0);
        con->v2.out_iter_sendpage = true;
        iov_iter_bvec(&con->v2.out_iter, ITER_SOURCE, &con->v2.out_bvec, 1,
                      con->v2.out_bvec.bv_len);
@@ -863,10 +862,7 @@ static void get_bvec_at(struct ceph_msg_data_cursor *cursor,
 
        /* get a piece of data, cursor isn't advanced */
        page = ceph_msg_data_next(cursor, &off, &len);
-
-       bv->bv_page = page;
-       bv->bv_offset = off;
-       bv->bv_len = len;
+       bvec_set_page(bv, page, len, off);
 }
 
 static int calc_sg_cnt(void *buf, int buf_len)
@@ -1855,9 +1851,8 @@ static void prepare_read_enc_page(struct ceph_connection *con)
             con->v2.in_enc_resid);
        WARN_ON(!con->v2.in_enc_resid);
 
-       bv.bv_page = con->v2.in_enc_pages[con->v2.in_enc_i];
-       bv.bv_offset = 0;
-       bv.bv_len = min(con->v2.in_enc_resid, (int)PAGE_SIZE);
+       bvec_set_page(&bv, con->v2.in_enc_pages[con->v2.in_enc_i],
+                     min(con->v2.in_enc_resid, (int)PAGE_SIZE), 0);
 
        set_in_bvec(con, &bv);
        con->v2.in_enc_i++;
@@ -2998,9 +2993,8 @@ static void queue_enc_page(struct ceph_connection *con)
             con->v2.out_enc_resid);
        WARN_ON(!con->v2.out_enc_resid);
 
-       bv.bv_page = con->v2.out_enc_pages[con->v2.out_enc_i];
-       bv.bv_offset = 0;
-       bv.bv_len = min(con->v2.out_enc_resid, (int)PAGE_SIZE);
+       bvec_set_page(&bv, con->v2.out_enc_pages[con->v2.out_enc_i],
+                     min(con->v2.out_enc_resid, (int)PAGE_SIZE), 0);
 
        set_out_bvec(con, &bv, false);
        con->v2.out_enc_i++;