cifs: use correct lock type in cifs_reconnect()
TCP_Server_Info::origin_fullpath and TCP_Server_Info::leaf_fullpath are protected by refpath_lock mutex and not cifs_tcp_ses_lock spinlock. Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz> Cc: stable@vger.kernel.org Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com> Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
parent
41f10081a9
commit
cd70a3e898
@ -534,12 +534,19 @@ int cifs_reconnect(struct TCP_Server_Info *server, bool mark_smb_session)
|
|||||||
{
|
{
|
||||||
/* If tcp session is not an dfs connection, then reconnect to last target server */
|
/* If tcp session is not an dfs connection, then reconnect to last target server */
|
||||||
spin_lock(&cifs_tcp_ses_lock);
|
spin_lock(&cifs_tcp_ses_lock);
|
||||||
if (!server->is_dfs_conn || !server->origin_fullpath || !server->leaf_fullpath) {
|
if (!server->is_dfs_conn) {
|
||||||
spin_unlock(&cifs_tcp_ses_lock);
|
spin_unlock(&cifs_tcp_ses_lock);
|
||||||
return __cifs_reconnect(server, mark_smb_session);
|
return __cifs_reconnect(server, mark_smb_session);
|
||||||
}
|
}
|
||||||
spin_unlock(&cifs_tcp_ses_lock);
|
spin_unlock(&cifs_tcp_ses_lock);
|
||||||
|
|
||||||
|
mutex_lock(&server->refpath_lock);
|
||||||
|
if (!server->origin_fullpath || !server->leaf_fullpath) {
|
||||||
|
mutex_unlock(&server->refpath_lock);
|
||||||
|
return __cifs_reconnect(server, mark_smb_session);
|
||||||
|
}
|
||||||
|
mutex_unlock(&server->refpath_lock);
|
||||||
|
|
||||||
return reconnect_dfs_server(server);
|
return reconnect_dfs_server(server);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user