From ea30b1823acd3fddba8fd352cec22db8968ed77f Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Wed, 12 Sep 2012 09:59:17 -0400 Subject: [PATCH] --- yaml --- r: 334075 b: refs/heads/master c: 6a3b15634279aa6740f9b829d25db32024b2ca7c h: refs/heads/master i: 334073: 8d247cac60c453b5768e53ab4770f4b3a23536ea 334071: f55b0c092c9820e6f1874628e95c25a13b0c9716 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b9e0a044ec5d..23bf522a57d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f9d3d3b7cd25763efec91db23a1cce1971147c2 +refs/heads/master: 6a3b15634279aa6740f9b829d25db32024b2ca7c diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 592cd7fb6f00..773b903c07c1 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -861,8 +861,7 @@ static void nfsd4_init_conn(struct svc_rqst *rqstp, struct nfsd4_conn *conn, str if (ret) /* oops; xprt is already down: */ nfsd4_conn_lost(&conn->cn_xpt_user); - if (ses->se_client->cl_cb_state == NFSD4_CB_DOWN && - conn->cn_flags & NFS4_CDFC4_BACK) { + if (conn->cn_flags & NFS4_CDFC4_BACK) { /* callback channel may be back up */ nfsd4_probe_callback(ses->se_client); } @@ -979,7 +978,6 @@ static struct nfsd4_session *init_session(struct svc_rqst *rqstp, struct nfsd4_s rpc_copy_addr((struct sockaddr *)&clp->cl_cb_conn.cb_addr, sa); clp->cl_cb_conn.cb_addrlen = svc_addr_len(sa); } - nfsd4_probe_callback(clp); return new; }