From adffe30def718b7962fa4cc9de1bad26486ff17a Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Tue, 6 Mar 2012 14:43:36 -0500 Subject: [PATCH] --- yaml --- r: 297445 b: refs/heads/master c: 393d8ed80f0e9b7edad737053a5fb375f0bf4849 h: refs/heads/master i: 297443: c2d4fd8a1a59519a77ba3adf3738413f4f8210d6 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0774d42b8c8a..38f54c5d0738 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1255a8f36cb16a02540bdad91c0bc0971b9fb429 +refs/heads/master: 393d8ed80f0e9b7edad737053a5fb375f0bf4849 diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 207c3bd266aa..c9c446d682ae 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -4415,7 +4415,9 @@ nfs4_has_reclaimed_state(const char *name, bool use_exchange_id) struct nfs4_client *clp; clp = find_confirmed_client_by_str(name, strhashval); - return clp ? 1 : 0; + if (!clp) + return 0; + return clp->cl_firststate; } /*