diff options
author | Steve French <sfrench@us.ibm.com> | 2010-02-25 00:36:46 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2010-02-25 00:36:46 -0500 |
commit | d7b619cf56218704ffce9d510aa497f0a0bcda0b (patch) | |
tree | ab382be7cce3ecd5152a339d1a839343aa7939f0 /fs/cifs/connect.c | |
parent | 122ca0076e5f84fa12943f22f6586ff285670783 (diff) |
[CIFS] pSesInfo->sesSem is used as mutex. Rename it to session_mutex and
convert it to a real mutex.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 2e9e09ca0e30..45eb6cba793f 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -2388,13 +2388,13 @@ try_mount_again: | |||
2388 | */ | 2388 | */ |
2389 | cifs_put_tcp_session(srvTcp); | 2389 | cifs_put_tcp_session(srvTcp); |
2390 | 2390 | ||
2391 | down(&pSesInfo->sesSem); | 2391 | mutex_lock(&pSesInfo->session_mutex); |
2392 | if (pSesInfo->need_reconnect) { | 2392 | if (pSesInfo->need_reconnect) { |
2393 | cFYI(1, ("Session needs reconnect")); | 2393 | cFYI(1, ("Session needs reconnect")); |
2394 | rc = cifs_setup_session(xid, pSesInfo, | 2394 | rc = cifs_setup_session(xid, pSesInfo, |
2395 | cifs_sb->local_nls); | 2395 | cifs_sb->local_nls); |
2396 | } | 2396 | } |
2397 | up(&pSesInfo->sesSem); | 2397 | mutex_unlock(&pSesInfo->session_mutex); |
2398 | } else if (!rc) { | 2398 | } else if (!rc) { |
2399 | cFYI(1, ("Existing smb sess not found")); | 2399 | cFYI(1, ("Existing smb sess not found")); |
2400 | pSesInfo = sesInfoAlloc(); | 2400 | pSesInfo = sesInfoAlloc(); |
@@ -2437,12 +2437,12 @@ try_mount_again: | |||
2437 | } | 2437 | } |
2438 | pSesInfo->linux_uid = volume_info->linux_uid; | 2438 | pSesInfo->linux_uid = volume_info->linux_uid; |
2439 | pSesInfo->overrideSecFlg = volume_info->secFlg; | 2439 | pSesInfo->overrideSecFlg = volume_info->secFlg; |
2440 | down(&pSesInfo->sesSem); | 2440 | mutex_lock(&pSesInfo->session_mutex); |
2441 | 2441 | ||
2442 | /* BB FIXME need to pass vol->secFlgs BB */ | 2442 | /* BB FIXME need to pass vol->secFlgs BB */ |
2443 | rc = cifs_setup_session(xid, pSesInfo, | 2443 | rc = cifs_setup_session(xid, pSesInfo, |
2444 | cifs_sb->local_nls); | 2444 | cifs_sb->local_nls); |
2445 | up(&pSesInfo->sesSem); | 2445 | mutex_unlock(&pSesInfo->session_mutex); |
2446 | } | 2446 | } |
2447 | 2447 | ||
2448 | /* search for existing tcon to this server share */ | 2448 | /* search for existing tcon to this server share */ |