Merged. Thanks!
Benny
On Oct. 22, 2009, 15:15 +0200, andros@xxxxxxxxxx wrote:
> From: Andy Adamson <andros@xxxxxxxxxx>
>
> Use _nfs4_async_handle_error and pass in either the MDS or DS client
>
> Reported-by: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
>
> nfs41_sequence_free_slot is called multiple times on SEQUENCE operation errors.
>
> Fix this by moving the call to nfs41_sequence_free_slot from the error path of
> nfs41_sequence_done to nfs4_async_handle_error for the SEQUENCE operation
> error cases.
>
> Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
> .
> ---
> fs/nfs/nfs4proc.c | 12 +++++++++---
> 1 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index c6abb45..72314c2 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -70,6 +70,9 @@ static int _nfs4_proc_open(struct nfs4_opendata *data);
> static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);
> static int nfs4_async_handle_error(struct rpc_task *, const struct nfs_server *,
> struct nfs4_state *, struct nfs4_sequence_res *);
> +static int _nfs4_async_handle_error(struct rpc_task *,
> + const struct nfs_server *, struct nfs_client *,
> + struct nfs4_state *, struct nfs4_sequence_res *);
> static int _nfs4_proc_lookup(struct inode *dir, const struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr);
> static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr);
>
> @@ -3045,7 +3048,8 @@ static int pnfs4_read_done(struct rpc_task *task, struct nfs_read_data *data)
>
> /* FIXME: pass data->args.context->state to nfs4_async_handle_error
> like in nfs4_read_done? */
> - if (nfs4_async_handle_error(task, mds_svr, NULL) == -EAGAIN) {
> + if (_nfs4_async_handle_error(task, NULL, client, NULL,
> + &data->res.seq_res) == -EAGAIN) {
> nfs4_restart_rpc(task, client);
> dprintk("<-- %s status= %d\n", __func__, -EAGAIN);
> return -EAGAIN;
> @@ -3085,7 +3089,8 @@ static int pnfs4_write_done(struct rpc_task *task, struct nfs_write_data *data)
> */
> /* FIXME: pass data->args.context->state to nfs4_async_handle_error
> like in nfs4_write_done? */
> - if (nfs4_async_handle_error(task, mds_svr, NULL) == -EAGAIN) {
> + if (_nfs4_async_handle_error(task, NULL, client, NULL,
> + &data->res.seq_res) == -EAGAIN) {
> nfs4_restart_rpc(task, client);
> dprintk("<-- %s status= %d\n", __func__, -EAGAIN);
> return -EAGAIN;
> @@ -3133,7 +3138,8 @@ static int pnfs4_commit_done(struct rpc_task *task, struct nfs_write_data *data)
>
> nfs41_sequence_done(client, &data->res.seq_res, task->tk_status);
>
> - if (nfs4_async_handle_error(task, mds_svr, NULL) == -EAGAIN) {
> + if (_nfs4_async_handle_error(task, NULL, client, NULL,
> + &data->res.seq_res) == -EAGAIN) {
> nfs4_restart_rpc(task, client);
> return -EAGAIN;
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
