diff options
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 59bc0011516b..2327a8c00862 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -783,7 +783,7 @@ static struct nfsd4_session *alloc_init_session(struct svc_rqst *rqstp, struct n | |||
| 783 | rpc_copy_addr((struct sockaddr *)&clp->cl_cb_conn.cb_addr, sa); | 783 | rpc_copy_addr((struct sockaddr *)&clp->cl_cb_conn.cb_addr, sa); |
| 784 | clp->cl_cb_conn.cb_addrlen = svc_addr_len(sa); | 784 | clp->cl_cb_conn.cb_addrlen = svc_addr_len(sa); |
| 785 | clp->cl_cb_conn.cb_minorversion = 1; | 785 | clp->cl_cb_conn.cb_minorversion = 1; |
| 786 | nfsd4_probe_callback(clp, &clp->cl_cb_conn); | 786 | nfsd4_probe_callback(clp); |
| 787 | } | 787 | } |
| 788 | return new; | 788 | return new; |
| 789 | } | 789 | } |
| @@ -1912,7 +1912,8 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, | |||
| 1912 | status = nfserr_clid_inuse; | 1912 | status = nfserr_clid_inuse; |
| 1913 | else { | 1913 | else { |
| 1914 | atomic_set(&conf->cl_cb_set, 0); | 1914 | atomic_set(&conf->cl_cb_set, 0); |
| 1915 | nfsd4_probe_callback(conf, &unconf->cl_cb_conn); | 1915 | nfsd4_change_callback(conf, &unconf->cl_cb_conn); |
| 1916 | nfsd4_probe_callback(conf); | ||
| 1916 | expire_client(unconf); | 1917 | expire_client(unconf); |
| 1917 | status = nfs_ok; | 1918 | status = nfs_ok; |
| 1918 | 1919 | ||
| @@ -1946,7 +1947,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, | |||
| 1946 | } | 1947 | } |
| 1947 | move_to_confirmed(unconf); | 1948 | move_to_confirmed(unconf); |
| 1948 | conf = unconf; | 1949 | conf = unconf; |
| 1949 | nfsd4_probe_callback(conf, &conf->cl_cb_conn); | 1950 | nfsd4_probe_callback(conf); |
| 1950 | status = nfs_ok; | 1951 | status = nfs_ok; |
| 1951 | } | 1952 | } |
| 1952 | } else if ((!conf || (conf && !same_verf(&conf->cl_confirm, &confirm))) | 1953 | } else if ((!conf || (conf && !same_verf(&conf->cl_confirm, &confirm))) |
