ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

NFS: Call readpage_async_filler() from nfs_readpage_async()

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

Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Dave Wysochanski
2021-01-28 09:55:02 -05:00
committed by Anna Schumaker
parent 1af7e7f8c1
commit 0c119e3a18
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
fs/nfs/read.c
View File

@@ -119,31 +119,22 @@ struct nfs_readdesc {
struct nfs_open_context *ctx; struct nfs_open_context *ctx;
}; };
static int readpage_async_filler(void *data, struct page *page);
int nfs_readpage_async(void *data, struct inode *inode, int nfs_readpage_async(void *data, struct inode *inode,
struct page *page) struct page *page)
{ {
struct nfs_readdesc *desc = data; struct nfs_readdesc *desc = data;
struct nfs_page *new;
unsigned int len;
struct nfs_pgio_mirror *pgm; struct nfs_pgio_mirror *pgm;
int error;
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);
nfs_pageio_init_read(&desc->pgio, inode, false, nfs_pageio_init_read(&desc->pgio, inode, false,
&nfs_async_read_completion_ops); &nfs_async_read_completion_ops);
if (!nfs_pageio_add_request(&desc->pgio, new)) {
nfs_list_remove_request(new); error = readpage_async_filler(desc, page);
nfs_readpage_release(new, desc->pgio.pg_error); if (error)
} goto out;
nfs_pageio_complete(&desc->pgio); nfs_pageio_complete(&desc->pgio);
/* It doesn't make sense to do mirrored reads! */ /* 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; NFS_I(inode)->read_io += pgm->pg_bytes_written;
return desc->pgio.pg_error < 0 ? desc->pgio.pg_error : 0; 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) static void nfs_page_group_set_uptodate(struct nfs_page *req)