On Wed, Apr 27, 2022 at 12:09:58PM -0700, dai.ngo@xxxxxxxxxx wrote:
>
> On 4/27/22 11:46 AM, J. Bruce Fields wrote:
> >On Wed, Apr 27, 2022 at 01:52:47AM -0700, Dai Ngo wrote:
> >>diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> >>index 234e852fcdfa..216bd77a8764 100644
> >>--- a/fs/nfsd/nfs4state.c
> >>+++ b/fs/nfsd/nfs4state.c
> >>@@ -125,6 +125,8 @@ static void free_session(struct nfsd4_session *);
> >> static const struct nfsd4_callback_ops nfsd4_cb_recall_ops;
> >> static const struct nfsd4_callback_ops nfsd4_cb_notify_lock_ops;
> >>+static struct workqueue_struct *laundry_wq;
> >>+
> >> static bool is_session_dead(struct nfsd4_session *ses)
> >> {
> >> return ses->se_flags & NFS4_SESSION_DEAD;
> >>@@ -152,6 +154,7 @@ static __be32 get_client_locked(struct nfs4_client *clp)
> >> if (is_client_expired(clp))
> >> return nfserr_expired;
> >> atomic_inc(&clp->cl_rpc_users);
> >>+ clp->cl_state = NFSD4_ACTIVE;
> >> return nfs_ok;
> >> }
> >>@@ -172,6 +175,7 @@ renew_client_locked(struct nfs4_client *clp)
> >> list_move_tail(&clp->cl_lru, &nn->client_lru);
> >> clp->cl_time = ktime_get_boottime_seconds();
> >>+ clp->cl_state = NFSD4_ACTIVE;
> >> }
> >We shouldn't need that assignment in both places.
> >
> >The laundromat really shouldn't let a client go to COURTESY while there
> >are rpc's in process for that client. So, let's just add that check to
> >the laundromat (see below), and then the assignment in
> >renew_client_locked becomes unnecessary.
>
> I added this for the case when the 4.0 COURTESY/EXPIRABLE client
> reconnects. The client needs to be restored back ACTIVE state and
> the RENEW is usually comes in first. Without this, the client
> continues to be in COURTESY/EXPIRABLE state.
Got it. OK, I think that makes sense.
--b.
