From c6da1f54bf53706c0124ef8685e2ead4947bf17b Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 24 Aug 2009 19:21:29 -0400 Subject: [PATCH] --- yaml --- r: 157057 b: refs/heads/master c: 7111dc73923e9737b38a3ef5b5f236109000ff28 h: refs/heads/master i: 157055: 2093ba6b4a24257dc87ae3f484d3d4f79b1932ed v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4state.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 320913130b67..7d99032e522e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2584e7986f235572d4b03bbe52fd1e85c1679b8e +refs/heads/master: 7111dc73923e9737b38a3ef5b5f236109000ff28 diff --git a/trunk/fs/nfs/nfs4state.c b/trunk/fs/nfs/nfs4state.c index 65ca8c18476f..1434080aefeb 100644 --- a/trunk/fs/nfs/nfs4state.c +++ b/trunk/fs/nfs/nfs4state.c @@ -1250,8 +1250,8 @@ static void nfs4_state_manager(struct nfs_client *clp) continue; } /* Initialize or reset the session */ - if (nfs4_has_session(clp) && - test_and_clear_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state)) { + if (test_and_clear_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state) + && nfs4_has_session(clp)) { if (clp->cl_cons_state == NFS_CS_SESSION_INITING) status = nfs4_initialize_session(clp); else