LinuxLists.cc - [PATCH v2 01/26] NFS: Clean up the pNFS layoutget interface

2012-09-21 20:50:54

Subject: [PATCH v2 01/26] NFS: Clean up the pNFS layoutget interface

Ensure that we do return errors from nfs4_proc_layoutget() and that we
don't mark the layout as having failed if the error was due to a
signal or resource problem on the client side.

Signed-off-by: Trond Myklebust <[email protected]>
---
fs/nfs/nfs4proc.c | 14 +++++++++-----
fs/nfs/pnfs.c | 25 ++++++++++++++++---------
fs/nfs/pnfs.h | 4 ++--
include/linux/nfs_xdr.h | 1 -
4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 645c450..b738577 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -6286,7 +6286,8 @@ static const struct rpc_call_ops nfs4_layoutget_call_ops = {
.rpc_release = nfs4_layoutget_release,
};

-void nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)
+struct pnfs_layout_segment *
+nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)
{
struct nfs_server *server = NFS_SERVER(lgp->args.inode);
size_t max_pages = max_response_pages(server);
@@ -6303,6 +6304,7 @@ void nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)
.callback_data = lgp,
.flags = RPC_TASK_ASYNC,
};
+ struct pnfs_layout_segment *lseg = NULL;
int status = 0;

dprintk("--> %s\n", __func__);
@@ -6310,7 +6312,7 @@ void nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)
lgp->args.layout.pages = nfs4_alloc_pages(max_pages, gfp_flags);
if (!lgp->args.layout.pages) {
nfs4_layoutget_release(lgp);
- return;
+ return ERR_PTR(-ENOMEM);
}
lgp->args.layout.pglen = max_pages * PAGE_SIZE;

@@ -6319,15 +6321,17 @@ void nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags)
nfs41_init_sequence(&lgp->args.seq_args, &lgp->res.seq_res, 0);
task = rpc_run_task(&task_setup_data);
if (IS_ERR(task))
- return;
+ return ERR_CAST(task);
status = nfs4_wait_for_completion_rpc_task(task);
if (status == 0)
status = task->tk_status;
if (status == 0)
- status = pnfs_layout_process(lgp);
+ lseg = pnfs_layout_process(lgp);
rpc_put_task(task);
dprintk("<-- %s status=%d\n", __func__, status);
- return;
+ if (status)
+ return ERR_PTR(status);
+ return lseg;
}

static void
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 2e00fea..3a7ac97 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -582,7 +582,7 @@ send_layoutget(struct pnfs_layout_hdr *lo,
struct inode *ino = lo->plh_inode;
struct nfs_server *server = NFS_SERVER(ino);
struct nfs4_layoutget *lgp;
- struct pnfs_layout_segment *lseg = NULL;
+ struct pnfs_layout_segment *lseg;

dprintk("--> %s\n", __func__);

@@ -599,16 +599,22 @@ send_layoutget(struct pnfs_layout_hdr *lo,
lgp->args.type = server->pnfs_curr_ld->id;
lgp->args.inode = ino;
lgp->args.ctx = get_nfs_open_context(ctx);
- lgp->lsegpp = &lseg;
lgp->gfp_flags = gfp_flags;

/* Synchronously retrieve layout information from server and
* store in lseg.
*/
- nfs4_proc_layoutget(lgp, gfp_flags);
- if (!lseg) {
- /* remember that LAYOUTGET failed and suspend trying */
- set_bit(lo_fail_bit(range->iomode), &lo->plh_flags);
+ lseg = nfs4_proc_layoutget(lgp, gfp_flags);
+ if (IS_ERR(lseg)) {
+ switch (PTR_ERR(lseg)) {
+ case -ENOMEM:
+ case -ERESTARTSYS:
+ break;
+ default:
+ /* remember that LAYOUTGET failed and suspend trying */
+ set_bit(lo_fail_bit(range->iomode), &lo->plh_flags);
+ }
+ return NULL;
}

return lseg;
@@ -1096,7 +1102,7 @@ out_unlock:
}
EXPORT_SYMBOL_GPL(pnfs_update_layout);

-int
+struct pnfs_layout_segment *
pnfs_layout_process(struct nfs4_layoutget *lgp)
{
struct pnfs_layout_hdr *lo = NFS_I(lgp->args.inode)->layout;
@@ -1129,7 +1135,7 @@ pnfs_layout_process(struct nfs4_layoutget *lgp)
}
init_lseg(lo, lseg);
lseg->pls_range = res->range;
- *lgp->lsegpp = get_lseg(lseg);
+ get_lseg(lseg);
pnfs_insert_layout(lo, lseg);

if (res->return_on_close) {
@@ -1140,8 +1146,9 @@ pnfs_layout_process(struct nfs4_layoutget *lgp)
/* Done processing layoutget. Set the layout stateid */
pnfs_set_layout_stateid(lo, &res->stateid, false);
spin_unlock(&ino->i_lock);
+ return lseg;
out:
- return status;
+ return ERR_PTR(status);

out_forget_reply:
spin_unlock(&ino->i_lock);
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 745aa1b..d51ef88 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -172,7 +172,7 @@ extern int nfs4_proc_getdevicelist(struct nfs_server *server,
struct pnfs_devicelist *devlist);
extern int nfs4_proc_getdeviceinfo(struct nfs_server *server,
struct pnfs_device *dev);
-extern void nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags);
+extern struct pnfs_layout_segment* nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags);
extern int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp);

/* pnfs.c */
@@ -192,7 +192,7 @@ void pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *, struct nfs_page
int pnfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc);
bool pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, struct nfs_page *req);
void pnfs_set_lo_fail(struct pnfs_layout_segment *lseg);
-int pnfs_layout_process(struct nfs4_layoutget *lgp);
+struct pnfs_layout_segment *pnfs_layout_process(struct nfs4_layoutget *lgp);
void pnfs_free_lseg_list(struct list_head *tmp_list);
void pnfs_destroy_layout(struct nfs_inode *);
void pnfs_destroy_all_layouts(struct nfs_client *);
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index be9cf3c..5da789f 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -251,7 +251,6 @@ struct nfs4_layoutget_res {
struct nfs4_layoutget {
struct nfs4_layoutget_args args;
struct nfs4_layoutget_res res;
- struct pnfs_layout_segment **lsegpp;
gfp_t gfp_flags;
};

--
1.7.11.4

2012-09-24 14:55:57

Subject: [PATCH v2 01/26] NFS: Clean up the pNFS layoutget interface

Subject: RE: [PATCH v2 06/26] NFSv4.1: Add helpers for setting/reading the I/O fail bit

Subject: [PATCH v2 20/26] NFSv4.1: Balance pnfs_layout_hdr refcount in pnfs_layout_(insert|remove)_lseg

Subject: [PATCH v2 23/26] squash! NFSv4.1: Remove redundant reference to the pnfs_layout_hdr

Subject: Re: [PATCH v2 06/26] NFSv4.1: Add helpers for setting/reading the I/O fail bit

Subject: [PATCH v2 24/26] NFSv4.1: Get rid of the NFS_LAYOUT_DESTROYED state

Subject: [PATCH v2 13/26] NFSv4.1: Get rid of pNFS layout state "NFS_LAYOUT_INVALID"

Subject: [PATCH v2 12/26] NFSv4.1: Simplify the pNFS return-on-close code

Subject: [PATCH v2 18/26] NFSv4.1: Clean up the removal of pnfs_layout_hdr from the server list

Subject: [PATCH v2 10/26] NFSv4.1: pnfs_layout_io_test_failed must clear invalid lsegs before a retry

Subject: Re: [PATCH v2 10/26] NFSv4.1: pnfs_layout_io_test_failed must clear invalid lsegs before a retry

Subject: [PATCH v2 11/26] NFSv4.1: Fix a race in the pNFS return-on-close code

Subject: [PATCH v2 14/26] NFSv4.1: reset the inode MDS threshold counters on layout destruction

Subject: [PATCH v2 07/26] NFSv4.1: Retry pNFS after a 2 minute timeout

Subject: [PATCH v2 26/26] NFSv4.1: Remove the NFS_LAYOUT_RETURNED state

Subject: [PATCH v2 03/26] NFSv4.1: Cleanup; add "pnfs_" prefix to get_layout_hdr() and put_layout_hdr()

Subject: [PATCH v2 19/26] NFSv4.1: Clean up pnfs_put_lseg()

Subject: [PATCH v2 08/26] NFSv4.1: pNFS data servers may be temporarily offline

Subject: [PATCH v2 02/26] NFSv4.1: Cleanup add a "pnfs_" prefix to mark_matching_lsegs_invalid

Subject: [PATCH v2 21/26] NFSv4.1: Get rid of pNFS spin lock debugging asserts...

Subject: [PATCH v2 06/26] NFSv4.1: Add helpers for setting/reading the I/O fail bit

Subject: [PATCH v2 16/26] NFSv4.1: Remove redundant reference to the pnfs_layout_hdr

Subject: [PATCH v2 04/26] NFSv4.1: Cleanup; add "pnfs_" prefix to put_lseg() and get_lseg()

Subject: [PATCH v2 22/26] NFSv4.1: Remove unused 'default allocation' for pnfs_alloc_layout_hdr()

Subject: [PATCH v2 15/26] NFSv4.1: Rename the pnfs_put_lseg_common to pnfs_layout_remove_lseg

Subject: [PATCH v2 17/26] NFSv4.1: Free the pnfs_layout_hdr outside the inode->i_lock

Subject: Re: [PATCH v2 10/26] NFSv4.1: pnfs_layout_io_test_failed must clear invalid lsegs before a retry

Subject: [PATCH v2 09/26] NFSv4.1: Fix a reference leak in pnfs_update_layout

Subject: [PATCH v2 05/26] NFSv4.1: Replace get_device_info() with filelayout_get_device_info()

Subject: [PATCH v2 25/26] NFSv4.1: Clear NFS_LAYOUT_BULK_RECALL when the layout segments are freed