pnfs-submit add layoutget, layoutreturn error handling
Subsystems (2)
cover pnfs-submit add layoutget, layoutreturn error handling
Plus some code cleanup 0001-SQUASHME-pnfs-submit-remove-unused-filelayout_mount_.patch
and some bug fixes 0002-SQUASHME-pnfs-submit-pnfs_try_to_read-write-commit-u.patch 0003-SQUASHME-pnfs-submit-tell-commit-to-use-the-MDS.patch
Remove unused (by file layout) encode_layoutreturn io operation 0004-SQUASHME-pnfs-submit-remove-encode_layoutreturn.patch 0005-SQUASHME-pnfs-submit-add-error-handling-to-layout-re.patch
0006-SQUASHME-pnfs-submit-handle-assassinated-layoutcommi.patch 0007-SQUASHME-pnfs-submit-add-error-handlers-to-layout-ge.patch
Add back encode_layoutreturn io operation 0008-pnfs-post-submit-restore-encode_layoutreturn.patch
Testing:
---------
CONFIG_NFS_V4_1 set: NFSv4.0 NFSv4.1 pNFS
Passes Connectathon tests
Tested layoutget and layoutreturn recovery from NFS4ERR_DEAD_SESSION with the pyNFS server and the testclient framework.
Still todo:
Recover from NFS4ERR_BAD_STATEID. Currently layoutreturn, layoutget, and layoutcommit do not pass nfs_stste to the error handlers.
Handle NFS4ERR_BAD_LAYOUT.
CONFIG_NFS_V4_1 not set: NFSv4.o mount passes cthon tests.
-->Andy
PATCH 1/8 SQUASHME: pnfs-submit remove unused filelayout_mount_type
From: Andy Adamson <[email protected]>
--- fs/nfs/nfs4filelayout.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
fs/nfs/nfs4filelayout.h +0 -6
@@ -24,8 +24,6 @@#define NFS4_PNFS_MAX_MULTI_CNT 64/* 256 fit into a u8 stripe_index */ #define NFS4_PNFS_MAX_MULTI_DS 2 -#define FILE_MT (inode) ((struct filelayout_mount_type *) \ - (NFS_SERVER(inode)->pnfs_mountid->mountid))#define FILE_DSADDR (lseg) (container_of(lseg->deviceid, \ struct nfs4_file_layout_dsaddr, \ deviceid))
@@ -76,10 +74,6 @@ struct nfs4_filelayout {u32 stripe_unit; }; -struct filelayout_mount_type { -struct super_block *fl_sb; -}; -extern struct nfs_fh *nfs4_fl_select_ds_fh (struct pnfs_layout_segment *lseg,loff_t offset);
Signature · 1 line
1.6.6
PATCH 2/8 SQUASHME pnfs-submit: pnfs_try_to_read, write, commit using freed memory
From: Andy Adamson <[email protected]>
The nfs_read_data or nfs_write_data is freed during rpc call.
--- fs/nfs/pnfs.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
fs/nfs/pnfs.h +6 -3
@@ -105,13 +105,14 @@ static inline enum pnfs_try_status pnfs_try_to_read_data(struct nfs_read_data *data, const struct rpc_call_ops *call_ops) { + struct inode *inode = data->inode;enum pnfs_try_status ret;if (!data->req->wb_lseg)return PNFS_NOT_ATTEMPTED ; ret =_pnfs_try_to_read_data (data, call_ops);if (ret ==PNFS_ATTEMPTED ) -nfs_inc_stats (data->inode,NFSIOS_PNFS_READ ); +nfs_inc_stats (inode,NFSIOS_PNFS_READ );else _pnfs_clear_lseg_from_pages (&data->pages);return ret;
@@ -122,13 +123,14 @@ pnfs_try_to_write_data(struct nfs_write_data *data, const struct rpc_call_ops *call_ops, int how) { +struct inode *inode = data->inode;enum pnfs_try_status ret;if (!data->req->wb_lseg)return PNFS_NOT_ATTEMPTED ; ret =_pnfs_try_to_write_data (data, call_ops, how);if (ret ==PNFS_ATTEMPTED ) -nfs_inc_stats (data->inode,NFSIOS_PNFS_WRITE ); +nfs_inc_stats (inode,NFSIOS_PNFS_WRITE );else _pnfs_clear_lseg_from_pages (&data->pages);return ret;
@@ -139,6 +141,7 @@ pnfs_try_to_commit(struct nfs_write_data *data, const struct rpc_call_ops *call_ops, int how) { +struct inode *inode = data->inode;enum pnfs_try_status ret;/* Unlike in pnfs_try_to_write_data and pnfs_try_to_read_data,
@@ -148,7 +151,7 @@ pnfs_try_to_commit(struct nfs_write_data *data,*/ ret =_pnfs_try_to_commit (data, call_ops, how);if (ret ==PNFS_ATTEMPTED ) -nfs_inc_stats (data->inode,NFSIOS_PNFS_COMMIT ); +nfs_inc_stats (inode,NFSIOS_PNFS_COMMIT );else _pnfs_clear_lseg_from_pages (&data->pages);return ret;
Signature · 1 line
1.6.6
PATCH 3/8 SQUASHME pnfs-submit: tell commit to use the MDS
From: Andy Adamson <[email protected]>
--- fs/nfs/pnfs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
fs/nfs/pnfs.c +1 -0
@@ -1454,6 +1454,7 @@ pnfs_writepages(struct nfs_write_data *wdata, int how) wdata);if (trypnfs ==PNFS_NOT_ATTEMPTED ) { + wdata->req->wb_lseg =NULL ; wdata->pdata.lseg =NULL ;put_lseg (lseg); }
Signature · 1 line
1.6.6
PATCH 4/8 SQUASHME pnfs-submit: remove encode_layoutreturn
From: Andy Adamson <[email protected]>
Not used by the file layout
--- fs/nfs/nfs4xdr.c | 15 ++------------- include/linux/nfs4_pnfs.h | 4 ---- 2 files changed, 2 insertions(+), 17 deletions(-)
fs/nfs/nfs4xdr.c +2 -13
@@ -1874,24 +1874,13 @@ encode_layoutreturn(struct xdr_stream *xdr, *p++ =cpu_to_be32 (args->lseg.iomode); *p =cpu_to_be32 (args->return_type);if (args->return_type ==RETURN_FILE ) { -struct layoutdriver_io_operations *ld_io_ops = -NFS_SERVER (args->inode)->pnfs_curr_ld->ld_io_ops; - p =reserve_space (xdr,16 +NFS4_STATEID_SIZE ); p =xdr_encode_hyper (p, args->lseg.offset); p =xdr_encode_hyper (p, args->lseg.length); p =xdr_encode_opaque_fixed (p, &args->stateid.u.data,NFS4_STATEID_SIZE ); - -dprintk ("%s: call %pF\n" , __func__, - ld_io_ops->encode_layoutreturn); -if (ld_io_ops->encode_layoutreturn) { - ld_io_ops->encode_layoutreturn ( - &NFS_I (args->inode)->layout, xdr, args); - }else { - p =reserve_space (xdr,4 ); - *p =cpu_to_be32 (0 ); - } + p =reserve_space (xdr,4 ); + *p =cpu_to_be32 (0 ); } hdr->nops++; hdr->replen += decode_layoutreturn_maxsz;
include/linux/nfs4_pnfs.h +0 -4
@@ -154,10 +154,6 @@ struct layoutdriver_io_operations {struct pnfs_layout_segment * (*alloc_lseg) (struct pnfs_layout_type *layoutid,struct nfs4_pnfs_layoutget_res *lgr);void (*free_lseg) (struct pnfs_layout_segment *lseg); -void (*encode_layoutreturn) (struct pnfs_layout_type *layoutid, -struct xdr_stream *xdr, -const struct nfs4_pnfs_layoutreturn_arg *args); -/* Registration information for a new mounted file system */ int (*initialize_mountpoint) (struct nfs_client *);
Signature · 1 line
1.6.6
PATCH 5/8 SQUASHME pnfs-submit: add error handling to layout return
From: Andy Adamson <[email protected]>
--- fs/nfs/nfs4proc.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-)
fs/nfs/nfs4proc.c +27 -10
@@ -5641,6 +5641,11 @@ static void nfs4_pnfs_layoutreturn_done(struct rpc_task *task, void *calldata)dprintk ("--> %s\n" , __func__);nfs4_sequence_done (server, &lrp->res.seq_res, task->tk_status); +if (RPC_ASSASSINATED (task)) +return ; + +if (nfs4_async_handle_error (task, server,NULL ,NULL ) == -EAGAIN ) +nfs_restart_rpc (task, server->nfs_client);dprintk ("<-- %s\n" , __func__); }
@@ -5667,7 +5672,7 @@ static const struct rpc_call_ops nfs4_pnfs_layoutreturn_call_ops = { .rpc_release = nfs4_pnfs_layoutreturn_release, }; -int pnfs4_proc_layoutreturn (struct nfs4_pnfs_layoutreturn *lrp,bool wait) +int _pnfs4_proc_layoutreturn (struct nfs4_pnfs_layoutreturn *lrp,bool issync) {struct inode *ino = lrp->args.inode;struct nfs_server *server =NFS_SERVER (ino);
@@ -5689,21 +5694,33 @@ int pnfs4_proc_layoutreturn(struct nfs4_pnfs_layoutreturn *lrp, bool wait)dprintk ("--> %s\n" , __func__); lrp->res.seq_res.sr_slotid =NFS4_MAX_SLOT_TABLE ; task =rpc_run_task (&task_setup_data); -if (IS_ERR (task)) { - status =PTR_ERR (task); +if (IS_ERR (task)) +return PTR_ERR (task); +if (!issync) goto out; - } -if (wait) { - status =nfs4_wait_for_completion_rpc_task (task); -if (status ==0 ) - status = task->tk_status; - } -rpc_put_task (task); + status =nfs4_wait_for_completion_rpc_task (task); +if (status !=0 ) + goto out; + status = task->tk_status; out:dprintk ("<-- %s\n" , __func__); +rpc_put_task (task);return status; } +int pnfs4_proc_layoutreturn (struct nfs4_pnfs_layoutreturn *lrp,bool issync) +{ +struct nfs_server *server =NFS_SERVER (lrp->args.inode); +struct nfs4_exception exception = { }; +int err; +do { + err =nfs4_handle_exception (server, +_pnfs4_proc_layoutreturn (lrp, issync), + &exception); + }while (exception.retry); +return err; +} +int nfs4_pnfs_getdeviceinfo (struct nfs_server *server,struct pnfs_device *pdev) {struct nfs4_pnfs_getdeviceinfo_arg args = {
Signature · 1 line
1.6.6
PATCH 6/8 SQUASHME pnfs-submit: handle assassinated layoutcommit
From: Andy Adamson <[email protected]>
--- fs/nfs/nfs4proc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
fs/nfs/nfs4proc.c +2 -0
@@ -5539,6 +5539,8 @@ pnfs_layoutcommit_done(struct rpc_task *task, void *calldata) data->status = task->tk_status;nfs4_sequence_done (server, &data->res.seq_res, task->tk_status); +if (RPC_ASSASSINATED (task)) +return ;if (nfs4_async_handle_error (task, server,NULL ,NULL ) == -EAGAIN )nfs_restart_rpc (task, server->nfs_client);
Signature · 1 line
1.6.6
PATCH 7/8 SQUASHME pnfs-submit: add error handlers to layout get
From: Andy Adamson <[email protected]>
Redo pnfs4_proc_layoutget() logic to match the other async operations that call nfs4_wait_for_completion_rpc_task.
pnfs_get_layout_done passes session and delay errors. Handle them with the generic error handlers.
--- fs/nfs/nfs4proc.c | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-)
fs/nfs/nfs4proc.c +29 -16
@@ -5446,6 +5446,10 @@ static void nfs4_pnfs_layoutget_done(struct rpc_task *task, void *calldata)return ;pnfs_get_layout_done (lgp, task->tk_status); + +if (nfs4_async_handle_error (task, server,NULL ,NULL ) == -EAGAIN ) +nfs_restart_rpc (task, server->nfs_client); +dprintk ("<-- %s\n" , __func__); }
@@ -5471,10 +5475,9 @@ static const struct rpc_call_ops nfs4_pnfs_layoutget_call_ops = {* and deal with retries. * Currently we can't since we release lgp and its contents. */ -int pnfs4_proc_layoutget (struct nfs4_pnfs_layoutget *lgp) +static int _pnfs4_proc_layoutget (struct nfs4_pnfs_layoutget *lgp) { -struct inode *ino = lgp->args.inode; -struct nfs_server *server =NFS_SERVER (ino); +struct nfs_server *server =NFS_SERVER (lgp->args.inode);struct rpc_task *task;struct rpc_message msg = { .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_PNFS_LAYOUTGET ],
@@ -5488,35 +5491,45 @@ int pnfs4_proc_layoutget(struct nfs4_pnfs_layoutget *lgp) .callback_data = lgp, .flags = RPC_TASK_ASYNC, }; -int status; +int status =0 ;dprintk ("--> %s\n" , __func__); lgp->res.layout.buf = (void *)__get_free_page (GFP_NOFS );if (lgp->res.layout.buf ==NULL ) {nfs4_pnfs_layoutget_release (lgp); - status = -ENOMEM ; - goto out; +return -ENOMEM ; } lgp->res.seq_res.sr_slotid =NFS4_MAX_SLOT_TABLE ; task =rpc_run_task (&task_setup_data); -if (IS_ERR (task)) { - status =PTR_ERR (task); - goto out; - } +if (IS_ERR (task)) +return PTR_ERR (task); status =nfs4_wait_for_completion_rpc_task (task); -if (status ==0 ) { - status = lgp->status; -if (status ==0 ) - status =pnfs_layout_process (lgp); - } -rpc_put_task (task); +if (status !=0 ) + goto out; + status = lgp->status; +if (status !=0 ) + goto out; + status =pnfs_layout_process (lgp); out: +rpc_put_task (task);dprintk ("<-- %s status=%d\n" , __func__, status);return status; } +int pnfs4_proc_layoutget (struct nfs4_pnfs_layoutget *lgp) +{ +struct nfs_server *server =NFS_SERVER (lgp->args.inode); +struct nfs4_exception exception = { }; +int err; +do { + err =nfs4_handle_exception (server,_pnfs4_proc_layoutget (lgp), + &exception); + }while (exception.retry); +return err; +} +static void pnfs_layoutcommit_prepare (struct rpc_task *task,void *data) { struct pnfs_layoutcommit_data *ldata =
Signature · 1 line
1.6.6
PATCH 8/8 pnfs-post-submit: restore encode_layoutreturn
From: Andy Adamson <[email protected]>
--- fs/nfs/nfs4xdr.c | 14 ++++++++++++-- include/linux/nfs4_pnfs.h | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-)
fs/nfs/nfs4xdr.c +12 -2
@@ -1874,13 +1874,23 @@ encode_layoutreturn(struct xdr_stream *xdr, *p++ =cpu_to_be32 (args->lseg.iomode); *p =cpu_to_be32 (args->return_type);if (args->return_type ==RETURN_FILE ) { +struct layoutdriver_io_operations *ld_io_ops = +NFS_SERVER (args->inode)->pnfs_curr_ld->ld_io_ops; + p =reserve_space (xdr,16 +NFS4_STATEID_SIZE ); p =xdr_encode_hyper (p, args->lseg.offset); p =xdr_encode_hyper (p, args->lseg.length); p =xdr_encode_opaque_fixed (p, &args->stateid.u.data,NFS4_STATEID_SIZE ); - p =reserve_space (xdr,4 ); - *p =cpu_to_be32 (0 ); +dprintk ("%s: call %pF\n" , __func__, + ld_io_ops->encode_layoutreturn); +if (ld_io_ops->encode_layoutreturn) { + ld_io_ops->encode_layoutreturn ( + &NFS_I (args->inode)->layout, xdr, args); + }else { + p =reserve_space (xdr,4 ); + *p =cpu_to_be32 (0 ); + } } hdr->nops++; hdr->replen += decode_layoutreturn_maxsz;
include/linux/nfs4_pnfs.h +4 -0
@@ -154,6 +154,10 @@ struct layoutdriver_io_operations {struct pnfs_layout_segment * (*alloc_lseg) (struct pnfs_layout_type *layoutid,struct nfs4_pnfs_layoutget_res *lgr);void (*free_lseg) (struct pnfs_layout_segment *lseg); +void (*encode_layoutreturn) (struct pnfs_layout_type *layoutid, +struct xdr_stream *xdr, +const struct nfs4_pnfs_layoutreturn_arg *args); +/* Registration information for a new mounted file system */ int (*initialize_mountpoint) (struct nfs_client *);
Signature · 1 line
1.6.6
Re: [PATCH 7/8] SQUASHME pnfs-submit: add error handlers to layout get
In reply to [email protected]Quoted 46 lines · On Jun. 23, 2010, 0:56 +0300, [email protected] wrote:
From: Andy Adamson <[email protected]>
Redo
pnfs4_proc_layoutget()logic to match the other async operations that callnfs4_wait_for_completion_rpc_task.
pnfs_get_layout_donepasses session and delay errors. Handle them with the generic error handlers.Signed-off-by Andy Adamson <[email protected]>--- fs/nfs/nfs4proc.c | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-)fs/nfs/nfs4proc.c +6
-4@@ -5446,6 +5446,10 @@ static void nfs4_pnfs_layoutget_done(struct rpc_task *task, void *calldata)return ;pnfs_get_layout_done (lgp, task->tk_status); + +if (nfs4_async_handle_error (task, server,NULL ,NULL ) == -EAGAIN ) +nfs_restart_rpc (task, server->nfs_client); +dprintk ("<-- %s\n" , __func__); }@@ -5471,10 +5475,9 @@ static const struct rpc_call_ops nfs4_pnfs_layoutget_call_ops = {* and deal with retries. * Currently we can't since we release lgp and its contents. */ -int pnfs4_proc_layoutget (struct nfs4_pnfs_layoutget *lgp) +static int _pnfs4_proc_layoutget (struct nfs4_pnfs_layoutget *lgp) { -struct inode *ino = lgp->args.inode; -struct nfs_server *server =NFS_SERVER (ino); +struct nfs_server *server =NFS_SERVER (lgp->args.inode);struct rpc_task *task;struct rpc_message msg = { .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_PNFS_LAYOUTGET ],@@ -5488,35 +5491,45 @@ int pnfs4_proc_layoutget(struct nfs4_pnfs_layoutget *lgp) .callback_data = lgp, .flags = RPC_TASK_ASYNC, }; -int status;
fs/nfs/nfs4proc.c int pnfs4_proc_layoutget(struct nfs4_pnfs_layoutget *lgp) · line 5501
Quoted 10 lines
fs/nfs/nfs4proc.c +2
-2+int status =0 ;dprintk ("--> %s\n" , __func__); lgp->res.layout.buf = (void *)__get_free_page (GFP_NOFS );if (lgp->res.layout.buf ==NULL ) {nfs4_pnfs_layoutget_release (lgp); - status = -ENOMEM ; - goto out; +return -ENOMEM ;
This will bypass the dprintk.
How about adding a out_no_task label after the call to rpc_put_task?
fs/nfs/nfs4proc.c int pnfs4_proc_layoutget(struct nfs4_pnfs_layoutget *lgp) · line 5507
Quoted 10 lines
fs/nfs/nfs4proc.c +2
-4} lgp->res.seq_res.sr_slotid =NFS4_MAX_SLOT_TABLE ; task =rpc_run_task (&task_setup_data); -if (IS_ERR (task)) { - status =PTR_ERR (task); - goto out; - } +if (IS_ERR (task)) +return PTR_ERR (task);
ditto.
Benny
Quoted 34 lines
fs/nfs/nfs4proc.c +19
-6status =nfs4_wait_for_completion_rpc_task (task); -if (status ==0 ) { - status = lgp->status; -if (status ==0 ) - status =pnfs_layout_process (lgp); - } -rpc_put_task (task); +if (status !=0 ) + goto out; + status = lgp->status; +if (status !=0 ) + goto out; + status =pnfs_layout_process (lgp); out: +rpc_put_task (task);dprintk ("<-- %s status=%d\n" , __func__, status);return status; } +int pnfs4_proc_layoutget (struct nfs4_pnfs_layoutget *lgp) +{ +struct nfs_server *server =NFS_SERVER (lgp->args.inode); +struct nfs4_exception exception = { }; +int err; +do { + err =nfs4_handle_exception (server,_pnfs4_proc_layoutget (lgp), + &exception); + }while (exception.retry); +return err; +} +static void pnfs_layoutcommit_prepare (struct rpc_task *task,void *data) { struct pnfs_layoutcommit_data *ldata =
Re: [PATCH 7/8] SQUASHME pnfs-submit: add error handlers to layout get
On Wed, Jun 23, 2010 at 3:41 AM, Benny Halevy <[email protected]> wro= te:
Quoted 4 lines · On Jun. 23, 2010, 0:56 +0300, [email protected] wrote:
Quoted 3 lines
From: Andy Adamson <[email protected]>
Redo
pnfs4_proc_layoutget()logic to match the other async operation=
s that call
Quoted 3 lines
Quoted 3 lines
nfs4_wait_for_completion_rpc_task.
pnfs_get_layout_donepasses session and delay errors. Handle them wi=
th the
Quoted 5 lines
Quoted 5 lines
generic error handlers.
Signed-off-by Andy Adamson <[email protected]>---
=A0fs/nfs/nfs4proc.c | =A0 45 +++++++++++++++++++++++++++++---------=
-------
Quoted 7 lines
fs/nfs/nfs4proc.c static void nfs4_pnfs_layoutget_done(struct r=
Quoted 7 lines
=A01 files changed, 29 insertions(+), 16 deletions(-)
fs/nfs/nfs4proc.c +0
-0@@ -5446,6 +5446,10 @@ static void nfs4_pnfs_layoutget_done(struct r=
pc_task *task, void *calldata)
Quoted 5 lines
fs/nfs/nfs4proc.c static void nfs4_pnfs_layoutget_done(struct r= · line 5450
Quoted 5 lines
fs/nfs/nfs4proc.c +2
-0=A0 =A0 =A0 =A0 =A0 =A0 =A0 return; =A0 =A0 =A0 pnfs_get_layout_done(lgp, task->tk_status); + + =A0 =A0 if (nfs4_async_handle_error(task, server, NULL, NULL) =3D=3D=
-EAGAIN)
Quoted 6 lines
fs/nfs/nfs4proc.c static const struct rpc_call_ops nfs4_pnfs_la=
Quoted 6 lines
fs/nfs/nfs4proc.c +2
-0+ =A0 =A0 =A0 =A0 =A0 =A0 nfs_restart_rpc(task, server->nfs_client); + =A0 =A0 =A0 dprintk("<-- %s\n", __func__); =A0}@@ -5471,10 +5475,9 @@ static const struct rpc_call_ops nfs4_pnfs_la=
youtget_call_ops =3D {
Quoted 4 lines
Quoted 4 lines
=A0 * and deal with retries.
=A0 * Currently we can't since we release lgp and its contents. =A0 */
-intpnfs4_proc_layoutget(struct nfs4_pnfs_layoutget *lgp)
Quoted 8 lines
Quoted 8 lines
+static int
_pnfs4_proc_layoutget(struct nfs4_pnfs_layoutget *lgp)=A0{
- =A0 =A0 struct inode *ino =3Dlgp->args.inode;
- =A0 =A0 structnfs_server*server =3DNFS_SERVER(ino);
+ =A0 =A0 structnfs_server*server =3DNFS_SERVER(lgp->args.inode); =A0 =A0 =A0 structrpc_task*task;
=A0 =A0 =A0 structrpc_messagemsg =3D {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 .rpc_proc =3D &nfs4_procedures[NFSPROC4_=
CLNT_PNFS_LAYOUTGET],
Quoted 1 line
fs/nfs/nfs4proc.c int pnfs4_proc_layoutget(struct nfs4_pnfs_la=
Quoted 1 line
fs/nfs/nfs4proc.c +0
-0@@ -5488,35 +5491,45 @@ int pnfs4_proc_layoutget(struct nfs4_pnfs_la=
youtget *lgp)
Quoted 9 lines
Quoted 9 lines
fs/nfs/nfs4proc.c +1
-1=A0 =A0 =A0 =A0 =A0 =A0 =A0 .callback_data =3D lgp, =A0 =A0 =A0 =A0 =A0 =A0 =A0 .flags =3D RPC_TASK_ASYNC, =A0 =A0 =A0 }; - =A0 =A0 int status; + =A0 =A0 int status =3D 0; =A0 =A0 =A0 dprintk("--> %s\n", __func__);=A0 =A0 =A0
lgp->res.layout.buf=3D (void *)__get_free_page(GFP_NOFS=
);
Quoted 8 lines
Quoted 5 lines
=A0 =A0 =A0 if (
lgp->res.layout.buf=3D=3D NULL) { =A0 =A0 =A0 =A0 =A0 =A0 =A0nfs4_pnfs_layoutget_release(lgp);
- =A0 =A0 =A0 =A0 =A0 =A0 status =3D-ENOMEM;
- =A0 =A0 =A0 =A0 =A0 =A0 goto out;
+ =A0 =A0 =A0 =A0 =A0 =A0 return-ENOMEM;This will bypass the dprintk.
How about adding aout_no_tasklabel after the call torpc_put_task?
Actually, I think we need to lose all of these dprintk's. Look at _nfs4_proc_delegreturn for example...
-->Andy
Quoted 12 lines
Quoted 11 lines
=A0 =A0 =A0 }
=A0 =A0 =A0
lgp->res.seq_res.sr_slotid=3DNFS4_MAX_SLOT_TABLE; =A0 =A0 =A0 task =3Drpc_run_task(&task_setup_data);
- =A0 =A0 if (IS_ERR(task)) {
- =A0 =A0 =A0 =A0 =A0 =A0 status =3DPTR_ERR(task);
- =A0 =A0 =A0 =A0 =A0 =A0 goto out;
- =A0 =A0 }
+ =A0 =A0 if (IS_ERR(task))
+ =A0 =A0 =A0 =A0 =A0 =A0 returnPTR_ERR(task);
Quoted 10 lines
ditto
Benny
Quoted 5 lines
=A0 =A0 =A0 status =3D
nfs4_wait_for_completion_rpc_task(task);
- =A0 =A0 if (status =3D=3D 0) {
- =A0 =A0 =A0 =A0 =A0 =A0 status =3Dlgp->status;
- =A0 =A0 =A0 =A0 =A0 =A0 if (status =3D=3D 0)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 status =3D pnfs_layout_pro=
cess(lgp);
Quoted 14 lines
Quoted 14 lines
- =A0 =A0 }
- =A0 =A0rpc_put_task(task);
+ =A0 =A0 if (status !=3D 0)
+ =A0 =A0 =A0 =A0 =A0 =A0 goto out;
+ =A0 =A0 status =3Dlgp->status;
+ =A0 =A0 if (status !=3D 0)
+ =A0 =A0 =A0 =A0 =A0 =A0 goto out;
+ =A0 =A0 status =3Dpnfs_layout_process(lgp); =A0out:
+ =A0 =A0rpc_put_task(task);
=A0 =A0 =A0dprintk("<-- %s status=3D%d\n", __func__, status); =A0 =A0 =A0 return status;
=A0}
Quoted 7 lines
fs/nfs/nfs4proc.c
Quoted 7 lines
fs/nfs/nfs4proc.c +7
-0+int pnfs4_proc_layoutget(struct nfs4_pnfs_layoutget *lgp) +{ + =A0 =A0 struct nfs_server *server =3D NFS_SERVER(lgp->args.inode); + =A0 =A0 struct nfs4_exception exception =3D { }; + =A0 =A0 int err; + =A0 =A0 do { + =A0 =A0 =A0 =A0 =A0 =A0 err =3D nfs4_handle_exception(server, _pnf=
s4_proc_layoutget(lgp),
Quoted 1 line
Quoted 1 line
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
=A0 =A0 =A0 &exception);
Quoted 5 lines
Quoted 5 lines
+ =A0 =A0 } while (exception.retry);
+ =A0 =A0 return err;fs/nfs/nfs4proc.c +2
-0+} +=A0static void pnfs_layoutcommit_prepare(struct
rpc_task*task, void=
*data)
Quoted 5 lines
Quoted 2 lines
=A0{
=A0 =A0 =A0 structpnfs_layoutcommit_data*ldata =3D--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" =
in
Quoted 3 lines
the body of a message to [email protected]
More majordomo info at =A0http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): AANLkTinew-MgRJeswY3x7gJS-GBE_WMHhJdkWnrNGuo4-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH 7/8] SQUASHME pnfs-submit: add error handlers to layout get
Quoted 1 line · William A. (Andy) Adamson
On Wed, Jun 23, 2010 at 3:41 AM, Benny Halevy <[email protected]> w=
rote:
Quoted 4 lines
Quoted 4 lines · On Jun. 23, 2010, 0:56 +0300, [email protected] wrote:
Quoted 3 lines
From: Andy Adamson <[email protected]>
Redo
pnfs4_proc_layoutget()logic to match the other async operatio=
ns that call
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
nfs4_wait_for_completion_rpc_task.
pnfs_get_layout_donepasses session and delay errors. Handle them w=
ith the
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
generic error handlers.
Signed-off-by Andy Adamson <[email protected]>---
=A0fs/nfs/nfs4proc.c | =A0 45 +++++++++++++++++++++++++++++--------=
--------
Quoted 7 lines
Quoted 7 lines
fs/nfs/nfs4proc.c static void nfs4_pnfs_layoutget_done(struct =
Quoted 7 lines
=A01 files changed, 29 insertions(+), 16 deletions(-)
fs/nfs/nfs4proc.c +0
-0@@ -5446,6 +5446,10 @@ static void nfs4_pnfs_layoutget_done(struct =
rpc_task *task, void *calldata)
Quoted 5 lines
Quoted 5 lines
fs/nfs/nfs4proc.c static void nfs4_pnfs_layoutget_done(struct = · line 5450
Quoted 5 lines
fs/nfs/nfs4proc.c +2
-0=A0 =A0 =A0 =A0 =A0 =A0 =A0 return; =A0 =A0 =A0 pnfs_get_layout_done(lgp, task->tk_status); + + =A0 =A0 if (nfs4_async_handle_error(task, server, NULL, NULL) =3D=
=3D -EAGAIN)
Quoted 1 line
Quoted 1 line
fs/nfs/nfs4proc.c static void nfs4_pnfs_layoutget_done(struct = · line 5451
Quoted 1 line
fs/nfs/nfs4proc.c +1
-0+ =A0 =A0 =A0 =A0 =A0 =A0 nfs_restart_rpc(task, server->nfs_client)=
;
Quoted 5 lines
Quoted 5 lines
fs/nfs/nfs4proc.c static const struct rpc_call_ops nfs4_pnfs_l=
Quoted 5 lines
fs/nfs/nfs4proc.c +1
-0+ =A0 =A0 =A0 dprintk("<-- %s\n", __func__); =A0}@@ -5471,10 +5475,9 @@ static const struct rpc_call_ops nfs4_pnfs_l=
ayoutget_call_ops =3D {
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
=A0 * and deal with retries.
=A0 * Currently we can't since we release lgp and its contents. =A0 */fs/nfs/nfs4proc.c +1
-1-int pnfs4_proc_layoutget (struct nfs4_pnfs_layoutget *lgp) +static int _pnfs4_proc_layoutget (struct nfs4_pnfs_layoutget *lgp)=A0{
- =A0 =A0 struct inode *ino =3Dlgp->args.inode;
- =A0 =A0 structnfs_server*server =3DNFS_SERVER(ino);
+ =A0 =A0 structnfs_server*server =3D NFS_SERVER(lgp->args.inode)=
;
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
=A0 =A0 =A0 struct
rpc_task*task;
=A0 =A0 =A0 structrpc_messagemsg =3D {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 .rpc_proc =3D &nfs4_procedures[NFSPROC4=
_CLNT_PNFS_LAYOUTGET],
Quoted 1 line
Quoted 1 line
fs/nfs/nfs4proc.c int pnfs4_proc_layoutget(struct nfs4_pnfs_l=
Quoted 1 line
fs/nfs/nfs4proc.c +0
-0@@ -5488,35 +5491,45 @@ int pnfs4_proc_layoutget(struct nfs4_pnfs_l=
ayoutget *lgp)
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
fs/nfs/nfs4proc.c +1
-1=A0 =A0 =A0 =A0 =A0 =A0 =A0 .callback_data =3D lgp, =A0 =A0 =A0 =A0 =A0 =A0 =A0 .flags =3D RPC_TASK_ASYNC, =A0 =A0 =A0 }; - =A0 =A0 int status; + =A0 =A0 int status =3D 0; =A0 =A0 =A0 dprintk("--> %s\n", __func__);=A0 =A0 =A0
lgp->res.layout.buf=3D (void *)__get_free_page(GFP_NOF=
S);
Quoted 11 lines
Quoted 8 lines
Quoted 5 lines
=A0 =A0 =A0 if (
lgp->res.layout.buf=3D=3D NULL) { =A0 =A0 =A0 =A0 =A0 =A0 =A0nfs4_pnfs_layoutget_release(lgp);
- =A0 =A0 =A0 =A0 =A0 =A0 status =3D-ENOMEM;
- =A0 =A0 =A0 =A0 =A0 =A0 goto out;
+ =A0 =A0 =A0 =A0 =A0 =A0 return-ENOMEM;This will bypass the dprintk.
How about adding aout_no_tasklabel after the call torpc_put_task?Actually, I think we need to lose all of these dprintk's. Look at
_nfs4_proc_delegreturnfor example...
Since pnfs4_proc_layoutget is only called by send_layout which prints the status, I'll leave this alone for now.
Sometime soon we will need to purge the pnfs-submit branch of dprintks
-->Andy
Quoted 25 lines
-->Andy
Quoted 22 lines
Quoted 11 lines
=A0 =A0 =A0 }
=A0 =A0 =A0
lgp->res.seq_res.sr_slotid=3DNFS4_MAX_SLOT_TABLE; =A0 =A0 =A0 task =3Drpc_run_task(&task_setup_data);
- =A0 =A0 if (IS_ERR(task)) {
- =A0 =A0 =A0 =A0 =A0 =A0 status =3DPTR_ERR(task);
- =A0 =A0 =A0 =A0 =A0 =A0 goto out;
- =A0 =A0 }
+ =A0 =A0 if (IS_ERR(task))
+ =A0 =A0 =A0 =A0 =A0 =A0 returnPTR_ERR(task);ditto
Benny
Quoted 5 lines
=A0 =A0 =A0 status =3D
nfs4_wait_for_completion_rpc_task(task);
- =A0 =A0 if (status =3D=3D 0) {
- =A0 =A0 =A0 =A0 =A0 =A0 status =3Dlgp->status;
- =A0 =A0 =A0 =A0 =A0 =A0 if (status =3D=3D 0)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 status =3D pnfs_layout_pr=
ocess(lgp);
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
- =A0 =A0 }
- =A0 =A0rpc_put_task(task);
+ =A0 =A0 if (status !=3D 0)
+ =A0 =A0 =A0 =A0 =A0 =A0 goto out;
+ =A0 =A0 status =3Dlgp->status;
+ =A0 =A0 if (status !=3D 0)
+ =A0 =A0 =A0 =A0 =A0 =A0 goto out;
+ =A0 =A0 status =3Dpnfs_layout_process(lgp); =A0out:
+ =A0 =A0rpc_put_task(task);
=A0 =A0 =A0dprintk("<-- %s status=3D%d\n", __func__, status); =A0 =A0 =A0 return status;
=A0}
Quoted 3 lines
Quoted 3 lines
fs/nfs/nfs4proc.c int pnfs4_proc_layoutget(struct nfs4_pnfs_layoutget *lgp)
Quoted 3 lines
fs/nfs/nfs4proc.c +3
-0+int pnfs4_proc_layoutget (struct nfs4_pnfs_layoutget *lgp) +{ + =A0 =A0 struct nfs_server *server =3D NFS_SERVER(lgp->args.inode)=
;
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
+ =A0 =A0 struct
nfs4_exceptionexception =3D { };
+ =A0 =A0 int err;
+ =A0 =A0 do {
+ =A0 =A0 =A0 =A0 =A0 =A0 err =3D nfs4_handle_exception(server, _pn=
fs4_proc_layoutget(lgp),
Quoted 1 line
Quoted 1 line
Quoted 1 line
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
=A0 =A0 =A0 &exception);
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
+ =A0 =A0 } while (exception.retry);
+ =A0 =A0 return err;fs/nfs/nfs4proc.c +2
-0+} +=A0static void pnfs_layoutcommit_prepare(struct
rpc_task*task, voi=
d *data)
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
=A0{
=A0 =A0 =A0 structpnfs_layoutcommit_data*ldata =3D--
To unsubscribe from this list: send the line "unsubscribe linux-nfs"=
in
Quoted 4 lines
Quoted 3 lines
the body of a message to [email protected]
More majordomo info at =A0http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/8] SQUASHME pnfs-submit: tell commit to use the MDS
In reply to [email protected]fs/nfs/pnfs.c pnfs_writepages(struct nfs_write_data *wdata, i=
Quoted 12 lines · On Tue, Jun 22, 2010 at 5:56 PM, <[email protected]> wrote:
From: Andy Adamson <[email protected]>
Signed-off-by Andy Adamson <[email protected]>---
=A0fs/nfs/pnfs.c | =A0 =A01 +
=A01 files changed, 1 insertions(+), 0 deletions(-)fs/nfs/pnfs.c +0
-0@@ -1454,6 +1454,7 @@ pnfs_writepages(struct nfs_write_data *wdata, i=
nt how)
Quoted 1 line
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0wdata);
Quoted 3 lines
=A0 =A0 =A0 =A0if (trypnfs =3D=3D
PNFS_NOT_ATTEMPTED) {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0wdata->req->wb_lseg=3D NULL;
This is wrong. It will be taken care of by _pnfs_clear_lseg_from_pages called by pnfs_try_to_write_data.
=46red
Quoted 8 lines
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0wdata->pdata.lseg =3D NULL; =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0put_lseg(lseg); =A0 =A0 =A0 =A0}
--
1.6.6--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" =
in
Quoted 3 lines
the body of a message to [email protected]
More majordomo info at =A0http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): AANLkTimh37nfPbw5CZmBJv1XhIqrlogV_0nUVSDaxZJ3-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH 3/8] SQUASHME pnfs-submit: tell commit to use the MDS
Quoted 16 lines · Fred Isaman
Quoted 15 lines · On Tue, Jun 22, 2010 at 5:56 PM, <[email protected]> wrote:
From: Andy Adamson <[email protected]>
Signed-off-by Andy Adamson <[email protected]>--- fs/nfs/pnfs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)fs/nfs/pnfs.c +0
-0@@ -1454,6 +1454,7 @@ pnfs_writepages(struct nfs_write_data *wdata, int how) wdata);
Quoted 5 lines
fs/nfs/pnfs.c pnfs_writepages(struct nfs_write_data *wdata, int how) · line 1457
Quoted 2 lines
fs/nfs/pnfs.c +1
-0if (trypnfs ==PNFS_NOT_ATTEMPTED ) { + wdata->req->wb_lseg =NULL ;This is wrong. It will be taken care of by
_pnfs_clear_lseg_from_pagescalled bypnfs_try_to_write_data.
A partial write, e.g. one that uses nfs_write_partial_ops, does not set nfs_write_data->pages, so _pnfs_clear_lseg_from_pages does not take care of clearing the req->wb_lseg.
Perhaps it would be cleaner to add this case to _pnfs_clear_lseg_from_pages.
-->Andy
Quoted 14 lines
Fred
Quoted 11 lines
fs/nfs/pnfs.c +0
-0wdata->pdata.lseg =NULL ;put_lseg (lseg);}--
1.6.6--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/8] SQUASHME pnfs-submit: tell commit to use the MDS
On Wed, Jun 23, 2010 at 9:53 AM, Andy Adamson <[email protected]> wrote= :
Quoted 12 lines · Fred Isaman
Quoted 10 lines · On Tue, Jun 22, 2010 at 5:56 PM, =A0<[email protected]> wrote:
Quoted 8 lines
From: Andy Adamson <[email protected]>
Signed-off-by Andy Adamson <[email protected]>---
=A0fs/nfs/pnfs.c | =A0 =A01 +
=A01 files changed, 1 insertions(+), 0 deletions(-)
Quoted 5 lines
Quoted 5 lines
fs/nfs/pnfs.c pnfs_writepages(struct nfs_write_data *wdata,=
Quoted 5 lines
fs/nfs/pnfs.c +0
-0@@ -1454,6 +1454,7 @@ pnfs_writepages(struct nfs_write_data *wdata,=
int
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
fs/nfs/pnfs.c +0
-0how)=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 wdata);
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
=A0 =A0 =A0 if (trypnfs =3D=3D
PNFS_NOT_ATTEMPTED) {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0wdata->req->wb_lseg=3D NULL;This is wrong. =A0It will be taken care of by
_pnfs_clear_lseg_from_pagescalled bypnfs_try_to_write_data.A partial write, e.g. one that uses
nfs_write_partial_ops, does not s=
et
Quoted 1 line
nfs_write_data->pages, so_pnfs_clear_lseg_from_pagesdoes not take c=
are of
Quoted 2 lines
clearing the
req->wb_lseg.
Hmmm, you are right.
Quoted 1 line
Perhaps it would be cleaner to add this case to _pnfs_clear_lseg_from=
_pages.
Quoted 1 line
I'll look into this, but for now your patch does the correct thing.
=46red
Quoted 13 lines
-->Andy
Quoted 11 lines
Fred
Quoted 8 lines
=A0 =A0 =A0 =A0 =A0 =A0 =A0
wdata->pdata.lseg=3D NULL; =A0 =A0 =A0 =A0 =A0 =A0 =A0put_lseg(lseg); =A0 =A0 =A0 }
--
1.6.6--
To unsubscribe from this list: send the line "unsubscribe linux-nfs=
" in
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
the body of a message to [email protected]
More majordomo info at =A0http://vger.kernel.org/majordomo-info.htm=
l
Quoted 3 lines
Quoted 1 line
Quoted 1 line
A message that is not in the archive (sent off-list or not yet received): AANLkTikzfFVMd76tevedVeQ4Q6ot5wxXZ8fxKFNz_zyK-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH 3/8] SQUASHME pnfs-submit: tell commit to use the MDS
Quoted 33 lines · Fred Isaman
Quoted 27 lines · Andy Adamson
Quoted 18 lines · Fred Isaman
Quoted 17 lines · On Tue, Jun 22, 2010 at 5:56 PM, <[email protected]> wrote:
From: Andy Adamson <[email protected]>
Signed-off-by Andy Adamson <[email protected]>--- fs/nfs/pnfs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)fs/nfs/pnfs.c +0
-0@@ -1454,6 +1454,7 @@ pnfs_writepages(struct nfs_write_data *wdata, int how) wdata);Quoted 5 lines
fs/nfs/pnfs.c pnfs_writepages(struct nfs_write_data *wdata, int how) · line 1457
Quoted 2 lines
fs/nfs/pnfs.c +1
-0if (trypnfs ==PNFS_NOT_ATTEMPTED ) { + wdata->req->wb_lseg =NULL ;This is wrong. It will be taken care of by
_pnfs_clear_lseg_from_pagescalled bypnfs_try_to_write_data.Quoted 4 lines
A partial write, e.g. one that uses
nfs_write_partial_ops, does not setnfs_write_data->pages, so_pnfs_clear_lseg_from_pagesdoes not take care of clearing thereq->wb_lseg.
Quoted 6 lines
Hmmm, you are right.
Quoted 2 lines
Perhaps it would be cleaner to add this case to
_pnfs_clear_lseg_from_pages.I'll look into this, but for now your patch does the correct thing.
I can resend with it moved to _pnfs_clear_lseg_from_pages.
-->Andy
Quoted 21 lines
Fred
Quoted 18 lines
-->Andy
Quoted 14 lines
Fred
Quoted 11 lines
fs/nfs/pnfs.c +0
-0wdata->pdata.lseg =NULL ;put_lseg(lseg); }--
1.6.6--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html