pnfs: recoalesce when ld read pagelist fails
For pnfs pagelist read failure, we need to pg_recoalesce and resend IO to mds. Signed-off-by: Peng Tao <peng_tao@emc.com> Signed-off-by: Jim Rees <rees@umich.edu> Cc: stable@kernel.org [3.0] Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
8ce160c5ef
commit
9b7eecdcfe
|
@ -1262,23 +1262,17 @@ EXPORT_SYMBOL_GPL(pnfs_generic_pg_writepages);
|
|||
/*
|
||||
* Called by non rpc-based layout drivers
|
||||
*/
|
||||
int
|
||||
pnfs_ld_read_done(struct nfs_read_data *data)
|
||||
void pnfs_ld_read_done(struct nfs_read_data *data)
|
||||
{
|
||||
int status;
|
||||
|
||||
if (!data->pnfs_error) {
|
||||
if (likely(!data->pnfs_error)) {
|
||||
__nfs4_read_done_cb(data);
|
||||
data->mds_ops->rpc_call_done(&data->task, data);
|
||||
data->mds_ops->rpc_release(data);
|
||||
return 0;
|
||||
} else {
|
||||
put_lseg(data->lseg);
|
||||
data->lseg = NULL;
|
||||
dprintk("pnfs write error = %d\n", data->pnfs_error);
|
||||
}
|
||||
|
||||
dprintk("%s: pnfs_error=%d, retry via MDS\n", __func__,
|
||||
data->pnfs_error);
|
||||
status = nfs_initiate_read(data, NFS_CLIENT(data->inode),
|
||||
data->mds_ops);
|
||||
return status ? : -EAGAIN;
|
||||
data->mds_ops->rpc_release(data);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(pnfs_ld_read_done);
|
||||
|
||||
|
|
|
@ -202,7 +202,7 @@ void pnfs_cleanup_layoutcommit(struct nfs4_layoutcommit_data *data);
|
|||
int pnfs_layoutcommit_inode(struct inode *inode, bool sync);
|
||||
int _pnfs_return_layout(struct inode *);
|
||||
void pnfs_ld_write_done(struct nfs_write_data *);
|
||||
int pnfs_ld_read_done(struct nfs_read_data *);
|
||||
void pnfs_ld_read_done(struct nfs_read_data *);
|
||||
struct pnfs_layout_segment *pnfs_update_layout(struct inode *ino,
|
||||
struct nfs_open_context *ctx,
|
||||
loff_t pos,
|
||||
|
|
|
@ -541,13 +541,23 @@ static void nfs_readpage_result_full(struct rpc_task *task, void *calldata)
|
|||
static void nfs_readpage_release_full(void *calldata)
|
||||
{
|
||||
struct nfs_read_data *data = calldata;
|
||||
struct nfs_pageio_descriptor pgio;
|
||||
|
||||
if (data->pnfs_error) {
|
||||
nfs_pageio_init_read_mds(&pgio, data->inode);
|
||||
pgio.pg_recoalesce = 1;
|
||||
}
|
||||
while (!list_empty(&data->pages)) {
|
||||
struct nfs_page *req = nfs_list_entry(data->pages.next);
|
||||
|
||||
nfs_list_remove_request(req);
|
||||
if (!data->pnfs_error)
|
||||
nfs_readpage_release(req);
|
||||
else
|
||||
nfs_pageio_add_request(&pgio, req);
|
||||
}
|
||||
if (data->pnfs_error)
|
||||
nfs_pageio_complete(&pgio);
|
||||
nfs_readdata_release(calldata);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue