Commit 8bb7cd84 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nfs: use bvec_set_page to initialize bvecs 



Use the bvec_set_page helper to initialize bvecs.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Link: https://lore.kernel.org/r/20230203150634.3199647-16-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cd598003

fs/nfs/fscache.c

+6 −10
Original line number Diff line number Diff line
@@ -245,14 +245,12 @@ static int fscache_fallback_read_page(struct inode *inode, struct page *page) 
	struct netfs_cache_resources cres;

	struct fscache_cookie *cookie = nfs_i_fscache(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)
@@ -273,16 +271,14 @@ static int fscache_fallback_write_page(struct inode *inode, struct page *page, 
	struct netfs_cache_resources cres;

	struct fscache_cookie *cookie = nfs_i_fscache(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)