Merged at pnfs-all-2.6.35-rc3-2010-06-17-1 Thanks! Benny On Jun. 17, 2010, 12:31 -0400, Boaz Harrosh <bharrosh@xxxxxxxxxxx> wrote: > > On a recall, a client may return NFS4ERR_DELAY to indicate > that it is busy with the layout and wants to be poled. > > TODO: If the client is stuck he would probably be cleaned > at expire client. But it is possible that the client > is active/renewing but would not acknowledge the > recall. We should take a time stamp on first recall > and expire the client if a lease time has passed. > > Signed-off-by: Boaz Harrosh <bharrosh@xxxxxxxxxxx> > --- > fs/nfsd/nfs4callback.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c > index e1faad4..8374ebd 100644 > --- a/fs/nfsd/nfs4callback.c > +++ b/fs/nfsd/nfs4callback.c > @@ -1044,6 +1044,12 @@ static void nfsd4_cb_layout_done(struct rpc_task *task, void *calldata) > */ > expire_client_lock(clp); > break; > + case -NFS4ERR_DELAY: > + /* 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); > + break; > case -NFS4ERR_NOMATCHING_LAYOUT: > nomatching_layout(clr); > } -- 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
