[PATCH 06/23] nvmet: use bvec_set_page to initialize bvecs

[Christoph Hellwig]

Use the bvec_set_page helper to initialize bvecs.

Signed-off-by: Christoph Hellwig <h...@lst.de>
Reviewed-by: Chaitanya Kulkarni <k...@nvidia.com>
Reviewed-by: Johannes Thumshirn <johannes.thumsh...@wdc.com>
---
 drivers/nvme/target/io-cmd-file.c | 10 ++--------
 drivers/nvme/target/tcp.c         |  5 ++---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/nvme/target/io-cmd-file.c 
b/drivers/nvme/target/io-cmd-file.c
index 871c4f32f443f5..2d068439b129c5 100644
--- a/drivers/nvme/target/io-cmd-file.c
+++ b/drivers/nvme/target/io-cmd-file.c
@@ -73,13 +73,6 @@ int nvmet_file_ns_enable(struct nvmet_ns *ns)
        return ret;
 }
 
-static void nvmet_file_init_bvec(struct bio_vec *bv, struct scatterlist *sg)
-{
-       bv->bv_page = sg_page(sg);
-       bv->bv_offset = sg->offset;
-       bv->bv_len = sg->length;
-}
-
 static ssize_t nvmet_file_submit_bvec(struct nvmet_req *req, loff_t pos,
                unsigned long nr_segs, size_t count, int ki_flags)
 {
@@ -146,7 +139,8 @@ static bool nvmet_file_execute_io(struct nvmet_req *req, 
int ki_flags)
 
        memset(&req->f.iocb, 0, sizeof(struct kiocb));
        for_each_sg(req->sg, sg, req->sg_cnt, i) {
-               nvmet_file_init_bvec(&req->f.bvec[bv_cnt], sg);
+               bvec_set_page(&req->f.bvec[bv_cnt], sg_page(sg), sg->length,
+                             sg->offset);
                len += req->f.bvec[bv_cnt].bv_len;
                total_len += req->f.bvec[bv_cnt].bv_len;
                bv_cnt++;
diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
index cc05c094de221d..c5759eb503d004 100644
--- a/drivers/nvme/target/tcp.c
+++ b/drivers/nvme/target/tcp.c
@@ -321,9 +321,8 @@ static void nvmet_tcp_build_pdu_iovec(struct nvmet_tcp_cmd 
*cmd)
        while (length) {
                u32 iov_len = min_t(u32, length, sg->length - sg_offset);
 
-               iov->bv_page = sg_page(sg);
-               iov->bv_len = sg->length;
-               iov->bv_offset = sg->offset + sg_offset;
+               bvec_set_page(iov, sg_page(sg), sg->length,
+                               sg->offset + sg_offset);
 
                length -= iov_len;
                sg = sg_next(sg);
-- 
2.39.0

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization