diff options
| author | Anna Schumaker <Anna.Schumaker@netapp.com> | 2014-05-06 09:12:35 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-05-28 18:41:04 -0400 |
| commit | 844c9e691d8723853ca8f2de0207683538645824 (patch) | |
| tree | 81e74dc24a665888727c0e7b26a59db2feea2ecb /fs/nfs/read.c | |
| parent | ce59515c1484d3a01bc2f3e7043dc488d25efe34 (diff) | |
| download | linux-844c9e691d8723853ca8f2de0207683538645824.tar.bz2 | |
NFS: Create a common pgio_error function
At this point, the read and write versions of this function look
identical so both should use the same function.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/read.c')
| -rw-r--r-- | fs/nfs/read.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 0c88c60fbee9..64f8eefec76a 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -237,19 +237,6 @@ static const struct nfs_pgio_completion_ops nfs_async_read_completion_ops = { .completion = nfs_read_completion, }; -static void nfs_pagein_error(struct nfs_pageio_descriptor *desc, - struct nfs_pgio_header *hdr) -{ - set_bit(NFS_IOHDR_REDO, &hdr->flags); - while (!list_empty(&hdr->rpc_list)) { - struct nfs_pgio_data *data = list_first_entry(&hdr->rpc_list, - struct nfs_pgio_data, list); - list_del(&data->list); - nfs_pgio_data_release(data); - } - desc->pg_completion_ops->error_cleanup(&desc->pg_list); -} - /* * Generate multiple requests to fill a single page. * @@ -278,10 +265,8 @@ static int nfs_pagein_multi(struct nfs_pageio_descriptor *desc, size_t len = min(nbytes,rsize); data = nfs_pgio_data_alloc(hdr, 1); - if (!data) { - nfs_pagein_error(desc, hdr); - return -ENOMEM; - } + if (!data) + return nfs_pgio_error(desc, hdr); data->pages.pagevec[0] = page; nfs_pgio_rpcsetup(data, len, offset, 0, NULL); list_add(&data->list, &hdr->rpc_list); @@ -305,10 +290,8 @@ static int nfs_pagein_one(struct nfs_pageio_descriptor *desc, data = nfs_pgio_data_alloc(hdr, nfs_page_array_len(desc->pg_base, desc->pg_count)); - if (!data) { - nfs_pagein_error(desc, hdr); - return -ENOMEM; - } + if (!data) + return nfs_pgio_error(desc, hdr); pages = data->pages.pagevec; while (!list_empty(head)) { |