android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFS: Revert pnfs ugliness from the generic NFS read code path

Browse Source 
pNFS-specific code belongs in the pnfs layer. It should not be
hijacking generic NFS read or write code paths.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2011-11-10 14:30:37 -05:00
parent 2aa13531bb
commit 62e4a76987
3 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/internal.h
View File

@ -299,6 +299,8 @@ extern void nfs_read_prepare(struct rpc_task *task, void *calldata);
extern int nfs_generic_pagein(struct nfs_pageio_descriptor *desc, extern int nfs_generic_pagein(struct nfs_pageio_descriptor *desc,
struct list_head *head); struct list_head *head);
extern void nfs_pageio_init_read_mds(struct nfs_pageio_descriptor *pgio,
struct inode *inode);
extern void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio); extern void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio);
extern void nfs_readdata_release(struct nfs_read_data *rdata); extern void nfs_readdata_release(struct nfs_read_data *rdata);

26
fs/nfs/pnfs.c
View File

@ -1259,6 +1259,25 @@ pnfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc)
} }
EXPORT_SYMBOL_GPL(pnfs_generic_pg_writepages); EXPORT_SYMBOL_GPL(pnfs_generic_pg_writepages);
static void pnfs_ld_handle_read_error(struct nfs_read_data *data)
{
struct nfs_pageio_descriptor pgio;
put_lseg(data->lseg);
data->lseg = NULL;
dprintk("pnfs write error = %d\n", data->pnfs_error);
nfs_pageio_init_read_mds(&pgio, data->inode);
while (!list_empty(&data->pages)) {
struct nfs_page *req = nfs_list_entry(data->pages.next);
nfs_list_remove_request(req);
nfs_pageio_add_request(&pgio, req);
}
nfs_pageio_complete(&pgio);
}
/* /*
* Called by non rpc-based layout drivers * Called by non rpc-based layout drivers
*/ */
@ -1267,11 +1286,8 @@ void pnfs_ld_read_done(struct nfs_read_data *data)
if (likely(!data->pnfs_error)) { if (likely(!data->pnfs_error)) {
__nfs4_read_done_cb(data); __nfs4_read_done_cb(data);
data->mds_ops->rpc_call_done(&data->task, data); data->mds_ops->rpc_call_done(&data->task, data);
} else { } else
put_lseg(data->lseg); pnfs_ld_handle_read_error(data);
data->lseg = NULL;
dprintk("pnfs write error = %d\n", data->pnfs_error);
}
data->mds_ops->rpc_release(data); data->mds_ops->rpc_release(data);
} }
EXPORT_SYMBOL_GPL(pnfs_ld_read_done); EXPORT_SYMBOL_GPL(pnfs_ld_read_done);

12
fs/nfs/read.c
View File

@ -109,7 +109,7 @@ static void nfs_readpage_truncate_uninitialised_page(struct nfs_read_data *data)
} }
} }
static void nfs_pageio_init_read_mds(struct nfs_pageio_descriptor *pgio, void nfs_pageio_init_read_mds(struct nfs_pageio_descriptor *pgio,
struct inode *inode) struct inode *inode)
{ {
nfs_pageio_init(pgio, inode, &nfs_pageio_read_ops, nfs_pageio_init(pgio, inode, &nfs_pageio_read_ops,
@ -534,23 +534,13 @@ static void nfs_readpage_result_full(struct rpc_task *task, void *calldata)
static void nfs_readpage_release_full(void *calldata) static void nfs_readpage_release_full(void *calldata)
{ {
struct nfs_read_data *data = 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)) { while (!list_empty(&data->pages)) {
struct nfs_page *req = nfs_list_entry(data->pages.next); struct nfs_page *req = nfs_list_entry(data->pages.next);
nfs_list_remove_request(req); nfs_list_remove_request(req);
if (!data->pnfs_error)
nfs_readpage_release(req); nfs_readpage_release(req);
else
nfs_pageio_add_request(&pgio, req);
} }
if (data->pnfs_error)
nfs_pageio_complete(&pgio);
nfs_readdata_release(calldata); nfs_readdata_release(calldata);
} }