diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-09-11 14:50:01 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-24 10:09:28 +0200 |
| commit | b35f5bd1e8ac808a163a260347f6690a93aa1c9b (patch) | |
| tree | 3445722581706ab2e9bc238891ac1da9087251a4 /fs | |
| parent | f8421e38337f3b19d202932af1b1b37b515e5063 (diff) | |
| download | linux-stable-b35f5bd1e8ac808a163a260347f6690a93aa1c9b.tar.gz linux-stable-b35f5bd1e8ac808a163a260347f6690a93aa1c9b.tar.bz2 linux-stable-b35f5bd1e8ac808a163a260347f6690a93aa1c9b.zip | |
NFSv4.1: Fix the CREATE_SESSION slot number accounting
commit b519d408ea32040b1c7e10b155a3ee9a36660947 upstream.
Ensure that we conform to the algorithm described in RFC5661, section
18.36.4 for when to bump the sequence id. In essence we do it for all
cases except when the RPC call timed out, or in case of the server returning
NFS4ERR_DELAY or NFS4ERR_STALE_CLIENTID.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 7796beacdefb..e2320c643107 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7509,12 +7509,20 @@ static int _nfs4_proc_create_session(struct nfs_client *clp, status = rpc_call_sync(session->clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT); trace_nfs4_create_session(clp, status); + switch (status) { + case -NFS4ERR_STALE_CLIENTID: + case -NFS4ERR_DELAY: + case -ETIMEDOUT: + case -EACCES: + case -EAGAIN: + goto out; + }; + + clp->cl_seqid++; if (!status) { /* Verify the session's negotiated channel_attrs values */ status = nfs4_verify_channel_attrs(&args, &res); /* Increment the clientid slot sequence id */ - if (clp->cl_seqid == res.seqid) - clp->cl_seqid++; if (status) goto out; nfs4_update_session(session, &res); |