diff options
| -rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 592cd7fb6f00..773b903c07c1 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -861,8 +861,7 @@ static void nfsd4_init_conn(struct svc_rqst *rqstp, struct nfsd4_conn *conn, str | |||
| 861 | if (ret) | 861 | if (ret) |
| 862 | /* oops; xprt is already down: */ | 862 | /* oops; xprt is already down: */ |
| 863 | nfsd4_conn_lost(&conn->cn_xpt_user); | 863 | nfsd4_conn_lost(&conn->cn_xpt_user); |
| 864 | if (ses->se_client->cl_cb_state == NFSD4_CB_DOWN && | 864 | if (conn->cn_flags & NFS4_CDFC4_BACK) { |
| 865 | conn->cn_flags & NFS4_CDFC4_BACK) { | ||
| 866 | /* callback channel may be back up */ | 865 | /* callback channel may be back up */ |
| 867 | nfsd4_probe_callback(ses->se_client); | 866 | nfsd4_probe_callback(ses->se_client); |
| 868 | } | 867 | } |
| @@ -979,7 +978,6 @@ static struct nfsd4_session *init_session(struct svc_rqst *rqstp, struct nfsd4_s | |||
| 979 | rpc_copy_addr((struct sockaddr *)&clp->cl_cb_conn.cb_addr, sa); | 978 | rpc_copy_addr((struct sockaddr *)&clp->cl_cb_conn.cb_addr, sa); |
| 980 | clp->cl_cb_conn.cb_addrlen = svc_addr_len(sa); | 979 | clp->cl_cb_conn.cb_addrlen = svc_addr_len(sa); |
| 981 | } | 980 | } |
| 982 | nfsd4_probe_callback(clp); | ||
| 983 | return new; | 981 | return new; |
| 984 | } | 982 | } |
| 985 | 983 | ||
