Re: [PATCH] SQUASHME: into [SQUASHME: pnfsd: Support for cb_layout returning NFS4ERR_DELAY]

[Benny Halevy <bhalevy@panasas.com>]

On Jun. 29, 2010, 14:36 +0300, Boaz Harrosh <bharrosh@panasas.com> wrote:
> 
> This is the correct code.
> 
> Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>

Merged at pnfs-all-2.6.35-rc3-2010-07-01

Thanks!

Benny


> ---
>  fs/nfsd/nfs4callback.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
> index 3bbeae8..60c719c 100644
> --- a/fs/nfsd/nfs4callback.c
> +++ b/fs/nfsd/nfs4callback.c
> @@ -1046,7 +1046,7 @@ static void nfsd4_cb_layout_done(struct rpc_task *task, void *calldata)
>  		/* Pole the client until it's done with the layout */
>  		rpc_delay(task, HZ/100); /* 10 mili-seconds */
>  		task->tk_status = 0;
> -		rpc_restart_call(task);
> +		rpc_restart_call_prepare(task);
>  		break;
>  	case -NFS4ERR_NOMATCHING_LAYOUT:
>  		task->tk_status = 0;