cifs: use bvec_set_page to initialize bvecs

[sfrench/cifs-2.6.git] / fs / cifs / fscache.c

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)