From: Trond Myklebust <Trond.Myklebust@netapp.com>
To: andros@netapp.com
Cc: linux-nfs@vger.kernel.org
Subject: Re: [PATCH 2/2] nfs41: clear NFS4CLNT_RECALL_SLOT bit on session reset
Date: Thu, 21 Jan 2010 14:42:55 -0500 [thread overview]
Message-ID: <1264102975.3721.9.camel@localhost> (raw)
In-Reply-To: <1264101557-6619-2-git-send-email-andros@netapp.com>
On Thu, 2010-01-21 at 14:19 -0500, andros@netapp.com wrote:
> From: Andy Adamson <andros@netapp.com>
>
> Signed-off-by: Andy Adamson <andros@netapp.com>
> ---
> fs/nfs/nfs4state.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
> index 069dcb3..c7f2944 100644
> --- a/fs/nfs/nfs4state.c
> +++ b/fs/nfs/nfs4state.c
> @@ -1291,9 +1291,12 @@ static int nfs4_reset_session(struct nfs_client *clp)
>
> memset(clp->cl_session->sess_id.data, 0, NFS4_MAX_SESSIONID_LEN);
> status = nfs4_proc_create_session(clp);
> - if (status)
> + if (status) {
> status = nfs4_recovery_handle_error(clp, status);
> -
> + goto out;
> + }
> + /* create_session negotiated new slot table */
> + clear_bit(NFS4CLNT_RECALL_SLOT, &clp->cl_state);
> out:
> /*
> * Let the state manager reestablish state
Errm.... Looking at nfs4_reset_session, wouldn't it make sense to move
that 'out:' label down one line, so that we can get rid of that test for
'status == 0'?
Trond
next prev parent reply other threads:[~2010-01-21 19:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-21 19:19 [PATCH 1/2] nfs41: fix nfs4_callback_recallslot andros
2010-01-21 19:19 ` [PATCH 2/2] nfs41: clear NFS4CLNT_RECALL_SLOT bit on session reset andros
2010-01-21 19:42 ` Trond Myklebust [this message]
2010-01-21 19:47 ` William A. (Andy) Adamson
2010-01-21 19:47 ` [PATCH 1/2] nfs41: fix nfs4_callback_recallslot Trond Myklebust
2010-01-21 19:58 ` William A. (Andy) Adamson
-- strict thread matches above, loose matches on Subject: below --
2010-01-21 19:54 [PATCH 2/2] nfs41: clear NFS4CLNT_RECALL_SLOT bit on session reset andros
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1264102975.3721.9.camel@localhost \
--to=trond.myklebust@netapp.com \
--cc=andros@netapp.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox