>From 67ed21725cee08343b25ebec364636110b904c41 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Fri, 16 May 2014 14:15:04 -0400 Subject: [PATCH] nfsd: fix build when CONFIG_NFSD_FAULT_INJECTION is enabled The patch entitled: NFSd: Protect session creation and client confirm using client_lock ...removes the mark_client_expired function, but doesn't fix the caller in nfsd_forget_clients. Have that function call mark_client_expired_locked after taking the cl_lock. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index eedbbcf7be27..f5a7a08728b3 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5435,7 +5435,13 @@ nfs4_check_open_reclaim(clientid_t *clid, u64 nfsd_forget_client(struct nfs4_client *clp, u64 max) { - if (mark_client_expired(clp)) + int ret; + struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id); + + spin_lock(&nn->client_lock); + ret = mark_client_expired_locked(clp); + spin_unlock(&nn->client_lock); + if (ret) return 0; expire_client(clp); return 1; -- 1.9.0