diff options
authorRick Macklem <rmacklem@FreeBSD.org>2022-07-11 23:50:34 +0000
committerRick Macklem <rmacklem@FreeBSD.org>2022-07-28 20:18:49 +0000
commit9bbf57a2ad4666371d8de3cde0a9b8879e826590 (patch)
parent99ff1bd55733d8fd20f6b70922639fa25b434ce9 (diff)
nfscl: Fix CreateSession for an established ClientID
Commit 981ef32230b2 added optional use of the session slots marked bad to recover a new session when all slots are marked bad. The recovery worked against a FreeBSD NFSv4.1/4.2 server, but not a Linux one. It turns out that it was a bug in the FreeBSD client and not the Linux server. This patch fixes the client so that DeleteSession followed by CreateSession after receiving a NFSERR_BADSESSION error reply works against the Linux server (and conforms to the RFC). This also implies that the FreeBSD NFSv4.1/4.2 server needs to be fixed in a future commit. Without the fix, the FreeBSD server does a full recovery, including creation of a new ClientID, but since "intr" mounts were broken, this does not result in a regression. This patch only affects the case where a CreateSession is done for an already confirmed ClientID, which was not being done prior to commit 981ef32230b2. PR: 260011 (cherry picked from commit d4a11b3e3bddb1fa3bdd101e12aea6f5937356fa)
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c
index 529655cfe5ca..51c7bb25d357 100644
--- a/sys/fs/nfsclient/nfs_clrpcops.c
+++ b/sys/fs/nfsclient/nfs_clrpcops.c
@@ -988,7 +988,7 @@ nfsrpc_setclient(struct nfsmount *nmp, struct nfsclclient *clp, int reclaim,
dsp->nfsclds_sess.nfsess_clientid =
dsp->nfsclds_sess.nfsess_sequenceid =
- odsp->nfsclds_sess.nfsess_sequenceid;
+ odsp->nfsclds_sess.nfsess_sequenceid + 1;
dsp->nfsclds_flags = odsp->nfsclds_flags;
if (dsp->nfsclds_servownlen > 0)