Skip to contentSkip to conversation

cifs: fix stray unlock in cifs_chan_skip_or_disable

PATCH In review [email protected] 2 participants 2 messages Jan 23, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cifs: fix stray unlock in cifs_chan_skip_or_disable

From: Shyam Prasad N <[email protected]>

A recent change moved the code that decides to skip a channel or disable multichannel entirely, into a helper function.

During this, a mutex_unlock of the session_mutex
should have been removed. Doing that here.

Fixes f591062bdbf4 ("cifs: handle servers that still advertise multichannel after disabling")
---
 fs/smb/client/smb2pdu.c | 1 -
 1 file changed, 1 deletion(-)
fs/smb/client/smb2pdu.c +0 -1
index 4f2cc8373b67..86f6f35b7f32 100644
@@ -195,7 +195,6 @@ cifs_chan_skip_or_disable(struct cifs_ses *ses,
 		pserver = server->primary_server;
 		cifs_signal_cifsd_for_reconnect(pserver, false);
 skip_terminate:
-		mutex_unlock(&ses->session_mutex);
 		return -EHOSTDOWN;
 	}
 
Signature · 1 line
2.34.1
#1 lore raw

tentatively merged into cifs-2.6.git for-next pending more review and testing (and temporarily backed out the larger cifs netfs integration patches series)

Quoted 31 lines · On Mon, Jan 22, 2024 at 11:08 PM <[email protected]> wrote:

From: Shyam Prasad N <[email protected]>

A recent change moved the code that decides to skip a channel or disable multichannel entirely, into a helper function.

During this, a mutex_unlock of the session_mutex
should have been removed. Doing that here.

Fixes f591062bdbf4 ("cifs: handle servers that still advertise multichannel after disabling")
---
 fs/smb/client/smb2pdu.c | 1 -
 1 file changed, 1 deletion(-)
fs/smb/client/smb2pdu.c +0 -2
index 4f2cc8373b67..86f6f35b7f32 100644
@@ -195,7 +195,6 @@ cifs_chan_skip_or_disable(struct cifs_ses *ses,
                pserver = server->primary_server;
                cifs_signal_cifsd_for_reconnect(pserver, false);
 skip_terminate:
-               mutex_unlock(&ses->session_mutex);
                return -EHOSTDOWN;
        }
 
--

2.34.1

Signature · 3 lines
Thanks,

Steve