NFS: Read cleanups
Remove unused variables, and reformat some code. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Cc: Fred Isaman <iisaman@netapp.com>
This commit is contained in:
parent
4f97615d19
commit
9146ab5055
|
@ -341,8 +341,6 @@ static int nfs_pagein_multi(struct nfs_pageio_descriptor *desc,
|
||||||
struct nfs_read_data *data;
|
struct nfs_read_data *data;
|
||||||
size_t rsize = desc->pg_bsize, nbytes;
|
size_t rsize = desc->pg_bsize, nbytes;
|
||||||
unsigned int offset;
|
unsigned int offset;
|
||||||
int requests = 0;
|
|
||||||
int ret = 0;
|
|
||||||
|
|
||||||
nfs_list_remove_request(req);
|
nfs_list_remove_request(req);
|
||||||
nfs_list_add_request(req, &hdr->pages);
|
nfs_list_add_request(req, &hdr->pages);
|
||||||
|
@ -358,12 +356,11 @@ static int nfs_pagein_multi(struct nfs_pageio_descriptor *desc,
|
||||||
data->pages.pagevec[0] = page;
|
data->pages.pagevec[0] = page;
|
||||||
nfs_read_rpcsetup(data, len, offset);
|
nfs_read_rpcsetup(data, len, offset);
|
||||||
list_add(&data->list, &hdr->rpc_list);
|
list_add(&data->list, &hdr->rpc_list);
|
||||||
requests++;
|
|
||||||
nbytes -= len;
|
nbytes -= len;
|
||||||
offset += len;
|
offset += len;
|
||||||
} while(nbytes != 0);
|
} while (nbytes != 0);
|
||||||
desc->pg_rpc_callops = &nfs_read_common_ops;
|
desc->pg_rpc_callops = &nfs_read_common_ops;
|
||||||
return ret;
|
return 0;
|
||||||
out_bad:
|
out_bad:
|
||||||
while (!list_empty(&hdr->rpc_list)) {
|
while (!list_empty(&hdr->rpc_list)) {
|
||||||
data = list_first_entry(&hdr->rpc_list, struct nfs_read_data, list);
|
data = list_first_entry(&hdr->rpc_list, struct nfs_read_data, list);
|
||||||
|
@ -387,8 +384,7 @@ static int nfs_pagein_one(struct nfs_pageio_descriptor *desc,
|
||||||
desc->pg_count));
|
desc->pg_count));
|
||||||
if (!data) {
|
if (!data) {
|
||||||
desc->pg_completion_ops->error_cleanup(head);
|
desc->pg_completion_ops->error_cleanup(head);
|
||||||
ret = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto out;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pages = data->pages.pagevec;
|
pages = data->pages.pagevec;
|
||||||
|
@ -402,8 +398,7 @@ static int nfs_pagein_one(struct nfs_pageio_descriptor *desc,
|
||||||
nfs_read_rpcsetup(data, desc->pg_count, 0);
|
nfs_read_rpcsetup(data, desc->pg_count, 0);
|
||||||
list_add(&data->list, &hdr->rpc_list);
|
list_add(&data->list, &hdr->rpc_list);
|
||||||
desc->pg_rpc_callops = &nfs_read_common_ops;
|
desc->pg_rpc_callops = &nfs_read_common_ops;
|
||||||
out:
|
return 0;
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int nfs_generic_pagein(struct nfs_pageio_descriptor *desc,
|
int nfs_generic_pagein(struct nfs_pageio_descriptor *desc,
|
||||||
|
|
Loading…
Reference in a new issue