diff options
Diffstat (limited to 'fs/cifs/transport.c')
| -rw-r--r-- | fs/cifs/transport.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 61ea3d3f95b4..1d81681d9b97 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -1045,18 +1045,19 @@ struct TCP_Server_Info *cifs_pick_channel(struct cifs_ses *ses) return NULL; spin_lock(&ses->chan_lock); - if (!ses->binding) { - /* round robin */ - if (ses->chan_count > 1) { - index = (uint)atomic_inc_return(&ses->chan_seq); - index %= ses->chan_count; - } - spin_unlock(&ses->chan_lock); - return ses->chans[index].server; - } else { - spin_unlock(&ses->chan_lock); - return cifs_ses_server(ses); + /* round robin */ +pick_another: + if (ses->chan_count > 1 && + !CIFS_ALL_CHANS_NEED_RECONNECT(ses)) { + index = (uint)atomic_inc_return(&ses->chan_seq); + index %= ses->chan_count; + + if (CIFS_CHAN_NEEDS_RECONNECT(ses, index)) + goto pick_another; } + spin_unlock(&ses->chan_lock); + + return ses->chans[index].server; } int @@ -1190,8 +1191,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, */ if ((ses->status == CifsNew) || (optype & CIFS_NEG_OP) || (optype & CIFS_SESS_OP)) { mutex_lock(&server->srv_mutex); - smb311_update_preauth_hash(ses, rqst[0].rq_iov, - rqst[0].rq_nvec); + smb311_update_preauth_hash(ses, server, rqst[0].rq_iov, rqst[0].rq_nvec); mutex_unlock(&server->srv_mutex); } @@ -1262,7 +1262,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, .iov_len = resp_iov[0].iov_len }; mutex_lock(&server->srv_mutex); - smb311_update_preauth_hash(ses, &iov, 1); + smb311_update_preauth_hash(ses, server, &iov, 1); mutex_unlock(&server->srv_mutex); } |