aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/connect.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2008-12-01 07:09:36 -0500
committerSteve French <sfrench@us.ibm.com>2008-12-25 21:29:09 -0500
commit72ca545b2d83ac7de671bf66d2dbc214528b4c0c (patch)
tree660fd7308d20a6e3dd30789d0107393cca0c9464 /fs/cifs/connect.c
parent0468a2cf914e79442b8309ce62e3f861599d8cab (diff)
cifs: convert tcpSem to a mutex
Mutexes are preferred for single-holder semaphores... Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r--fs/cifs/connect.c6
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