Commit 0c119e3a authored by Dave Wysochanski's avatar Dave Wysochanski Committed by Anna Schumaker
Browse files

NFS: Call readpage_async_filler() from nfs_readpage_async() 



Refactor slightly so nfs_readpage_async() calls into
readpage_async_filler().

Signed-off-by: default avatarDave Wysochanski <dwysocha@redhat.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 1af7e7f8

fs/nfs/read.c

+11 −17
Original line number Diff line number Diff line
@@ -119,31 +119,22 @@ struct nfs_readdesc { 
	struct nfs_open_context *ctx;

};



static int readpage_async_filler(void *data, struct page *page);



int nfs_readpage_async(void *data, struct inode *inode,

		       struct page *page)

{

	struct nfs_readdesc *desc = data;

	struct nfs_page	*new;

	unsigned int len;

	struct nfs_pgio_mirror *pgm;



	len = nfs_page_length(page);

	if (len == 0)

		return nfs_return_empty_page(page);

	new = nfs_create_request(desc->ctx, page, 0, len);

	if (IS_ERR(new)) {

		unlock_page(page);

		return PTR_ERR(new);

	}

	if (len < PAGE_SIZE)

		zero_user_segment(page, len, PAGE_SIZE);

	int error;



	nfs_pageio_init_read(&desc->pgio, inode, false,

			     &nfs_async_read_completion_ops);

	if (!nfs_pageio_add_request(&desc->pgio, new)) {

		nfs_list_remove_request(new);

		nfs_readpage_release(new, desc->pgio.pg_error);

	}



	error = readpage_async_filler(desc, page);

	if (error)

		goto out;



	nfs_pageio_complete(&desc->pgio);



	/* It doesn't make sense to do mirrored reads! */
@@ -153,6 +144,9 @@ int nfs_readpage_async(void *data, struct inode *inode, 
	NFS_I(inode)->read_io += pgm->pg_bytes_written;



	return desc->pgio.pg_error < 0 ? desc->pgio.pg_error : 0;



out:

	return error;

}



static void nfs_page_group_set_uptodate(struct nfs_page *req)