cifs: use bvec_set_page to initialize bvecs

Use the bvec_set_page helper to initialize bvecs.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Link: https://lore.kernel.org/r/20230203150634.3199647-14-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index b2a04b4e89a5e78cc8e37a8c7126521f290c9ecf..e6088d96eb04d2cf450d998df25618252f102bdd 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -759,8 +759,9 @@ cifs_read_page_from_socket(struct TCP_Server_Info *server, struct page *page,
        unsigned int page_offset, unsigned int to_read)
 {
        struct msghdr smb_msg = {};
-       struct bio_vec bv = {
-               .bv_page = page, .bv_len = to_read, .bv_offset = page_offset};
+       struct bio_vec bv;
+
+       bvec_set_page(&bv, page, to_read, page_offset);
        iov_iter_bvec(&smb_msg.msg_iter, ITER_DEST, &bv, 1, to_read);
        return cifs_readv_from_socket(server, &smb_msg);
 }

diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c
index f6f3a6b75601beaf73205191a3fb46758894b864..0911327ebfdeb4a9f6491d6df3d8c1768352abe7 100644 (file)
--- a/fs/cifs/fscache.c
+++ b/fs/cifs/fscache.c
@@ -143,14 +143,12 @@ static int fscache_fallback_read_page(struct inode *inode, struct page *page)
        struct netfs_cache_resources cres;
        struct fscache_cookie *cookie = cifs_inode_cookie(inode);
        struct iov_iter iter;
-       struct bio_vec bvec[1];
+       struct bio_vec bvec;
        int ret;
 
        memset(&cres, 0, sizeof(cres));
-       bvec[0].bv_page         = page;
-       bvec[0].bv_offset       = 0;
-       bvec[0].bv_len          = PAGE_SIZE;
-       iov_iter_bvec(&iter, ITER_DEST, bvec, ARRAY_SIZE(bvec), PAGE_SIZE);
+       bvec_set_page(&bvec, page, PAGE_SIZE, 0);
+       iov_iter_bvec(&iter, ITER_DEST, &bvec, 1, PAGE_SIZE);
 
        ret = fscache_begin_read_operation(&cres, cookie);
        if (ret < 0)
@@ -171,16 +169,14 @@ static int fscache_fallback_write_page(struct inode *inode, struct page *page,
        struct netfs_cache_resources cres;
        struct fscache_cookie *cookie = cifs_inode_cookie(inode);
        struct iov_iter iter;
-       struct bio_vec bvec[1];
+       struct bio_vec bvec;
        loff_t start = page_offset(page);
        size_t len = PAGE_SIZE;
        int ret;
 
        memset(&cres, 0, sizeof(cres));
-       bvec[0].bv_page         = page;
-       bvec[0].bv_offset       = 0;
-       bvec[0].bv_len          = PAGE_SIZE;
-       iov_iter_bvec(&iter, ITER_SOURCE, bvec, ARRAY_SIZE(bvec), PAGE_SIZE);
+       bvec_set_page(&bvec, page, PAGE_SIZE, 0);
+       iov_iter_bvec(&iter, ITER_SOURCE, &bvec, 1, PAGE_SIZE);
 
        ret = fscache_begin_write_operation(&cres, cookie);
        if (ret < 0)

diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index 2a19c7987c5bd8aafbf2840ed8749979d99701ad..95cc4d7dd806d7b29798569b7573b050e7c902f0 100644 (file)
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -1054,9 +1054,8 @@ setup_aio_ctx_iter(struct cifs_aio_ctx *ctx, struct iov_iter *iter, int rw)
 
                for (i = 0; i < cur_npages; i++) {
                        len = rc > PAGE_SIZE ? PAGE_SIZE : rc;
-                       bv[npages + i].bv_page = pages[i];
-                       bv[npages + i].bv_offset = start;
-                       bv[npages + i].bv_len = len - start;
+                       bvec_set_page(&bv[npages + i], pages[i], len - start,
+                                     start);
                        rc -= len;
                        start = 0;
                }

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index e6bcd2baf446a93a25ca3613029a960edd5137b9..cb2deac6b2d70edd5fea07fc2c3ddae0c64e66ae 100644 (file)
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -4598,9 +4598,9 @@ init_read_bvec(struct page **pages, unsigned int npages, unsigned int data_size,
                return -ENOMEM;
 
        for (i = 0; i < npages; i++) {
-               bvec[i].bv_page = pages[i];
-               bvec[i].bv_offset = (i == 0) ? cur_off : 0;
-               bvec[i].bv_len = min_t(unsigned int, PAGE_SIZE, data_size);
+               bvec_set_page(&bvec[i], pages[i],
+                             min_t(unsigned int, PAGE_SIZE, data_size),
+                             i == 0 ? cur_off : 0);
                data_size -= bvec[i].bv_len;
        }