diff options
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r-- | fs/cifs/connect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 701daf411a4b..61b68a0ee2ff 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -156,7 +156,7 @@ cifs_reconnect(struct TCP_Server_Info *server) | |||
156 | } | 156 | } |
157 | read_unlock(&cifs_tcp_ses_lock); | 157 | read_unlock(&cifs_tcp_ses_lock); |
158 | /* do not want to be sending data on a socket we are freeing */ | 158 | /* do not want to be sending data on a socket we are freeing */ |
159 | down(&server->tcpSem); | 159 | mutex_lock(&server->srv_mutex); |
160 | if (server->ssocket) { | 160 | if (server->ssocket) { |
161 | cFYI(1, ("State: 0x%x Flags: 0x%lx", server->ssocket->state, | 161 | cFYI(1, ("State: 0x%x Flags: 0x%lx", server->ssocket->state, |
162 | server->ssocket->flags)); | 162 | server->ssocket->flags)); |
@@ -182,7 +182,7 @@ cifs_reconnect(struct TCP_Server_Info *server) | |||
182 | } | 182 | } |
183 | } | 183 | } |
184 | spin_unlock(&GlobalMid_Lock); | 184 | spin_unlock(&GlobalMid_Lock); |
185 | up(&server->tcpSem); | 185 | mutex_unlock(&server->srv_mutex); |
186 | 186 | ||
187 | while ((server->tcpStatus != CifsExiting) && | 187 | while ((server->tcpStatus != CifsExiting) && |
188 | (server->tcpStatus != CifsGood)) { | 188 | (server->tcpStatus != CifsGood)) { |
@@ -2175,7 +2175,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, | |||
2175 | to the struct since the kernel thread not created yet | 2175 | to the struct since the kernel thread not created yet |
2176 | so no need to spinlock this init of tcpStatus */ | 2176 | so no need to spinlock this init of tcpStatus */ |
2177 | srvTcp->tcpStatus = CifsNew; | 2177 | srvTcp->tcpStatus = CifsNew; |
2178 | init_MUTEX(&srvTcp->tcpSem); | 2178 | mutex_init(&srvTcp->srv_mutex); |
2179 | 2179 | ||
2180 | /* | 2180 | /* |
2181 | * since we're in a cifs function already, we know that | 2181 | * since we're in a cifs function already, we know that |