leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CIFS] pSesInfo->sesSem is used as mutex. Rename it to session_mutex and

Browse Source 
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>
This commit is contained in:
Steve French 2010-02-25 05:36:46 +00:00
parent 122ca0076e
commit d7b619cf56
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/cifs/cifsglob.h
View File

@ -205,7 +205,7 @@ struct cifsUidInfo {
struct cifsSesInfo { struct cifsSesInfo {
struct list_head smb_ses_list; struct list_head smb_ses_list;
struct list_head tcon_list; struct list_head tcon_list;
struct semaphore sesSem; struct mutex session_mutex;
#if 0 #if 0
struct cifsUidInfo *uidInfo; /* pointer to user info */ struct cifsUidInfo *uidInfo; /* pointer to user info */
#endif #endif

12
fs/cifs/cifssmb.c
View File

@ -170,19 +170,19 @@ cifs_reconnect_tcon(struct cifsTconInfo *tcon, int smb_command)
* need to prevent multiple threads trying to simultaneously * need to prevent multiple threads trying to simultaneously
* reconnect the same SMB session * reconnect the same SMB session
*/ */
down(&ses->sesSem); mutex_lock(&ses->session_mutex);
if (ses->need_reconnect) if (ses->need_reconnect)
rc = cifs_setup_session(0, ses, nls_codepage); rc = cifs_setup_session(0, ses, nls_codepage);
/* do we need to reconnect tcon? */ /* do we need to reconnect tcon? */
if (rc || !tcon->need_reconnect) { if (rc || !tcon->need_reconnect) {
up(&ses->sesSem); mutex_unlock(&ses->session_mutex);
goto out; goto out;
} }
mark_open_files_invalid(tcon); mark_open_files_invalid(tcon);
rc = CIFSTCon(0, ses, tcon->treeName, tcon, nls_codepage); rc = CIFSTCon(0, ses, tcon->treeName, tcon, nls_codepage);
up(&ses->sesSem); mutex_unlock(&ses->session_mutex);
cFYI(1, ("reconnect tcon rc = %d", rc)); cFYI(1, ("reconnect tcon rc = %d", rc));
if (rc) if (rc)
@ -700,13 +700,13 @@ CIFSSMBLogoff(const int xid, struct cifsSesInfo *ses)
if (!ses || !ses->server) if (!ses || !ses->server)
return -EIO; return -EIO;
down(&ses->sesSem); mutex_lock(&ses->session_mutex);
if (ses->need_reconnect) if (ses->need_reconnect)
goto session_already_dead; /* no need to send SMBlogoff if uid goto session_already_dead; /* no need to send SMBlogoff if uid
already closed due to reconnect */ already closed due to reconnect */
rc = small_smb_init(SMB_COM_LOGOFF_ANDX, 2, NULL, (void **)&pSMB); rc = small_smb_init(SMB_COM_LOGOFF_ANDX, 2, NULL, (void **)&pSMB);
if (rc) { if (rc) {
up(&ses->sesSem); mutex_unlock(&ses->session_mutex);
return rc; return rc;
} }
@ -721,7 +721,7 @@ CIFSSMBLogoff(const int xid, struct cifsSesInfo *ses)
pSMB->AndXCommand = 0xFF; pSMB->AndXCommand = 0xFF;
rc = SendReceiveNoRsp(xid, ses, (struct smb_hdr *) pSMB, 0); rc = SendReceiveNoRsp(xid, ses, (struct smb_hdr *) pSMB, 0);
session_already_dead: session_already_dead:
up(&ses->sesSem); mutex_unlock(&ses->session_mutex);
/* if session dead then we do not need to do ulogoff, /* if session dead then we do not need to do ulogoff,
since server closed smb session, no sense reporting since server closed smb session, no sense reporting

8
fs/cifs/connect.c
View File

@ -2388,13 +2388,13 @@ try_mount_again:
*/ */
cifs_put_tcp_session(srvTcp); cifs_put_tcp_session(srvTcp);
down(&pSesInfo->sesSem); mutex_lock(&pSesInfo->session_mutex);
if (pSesInfo->need_reconnect) { if (pSesInfo->need_reconnect) {
cFYI(1, ("Session needs reconnect")); cFYI(1, ("Session needs reconnect"));
rc = cifs_setup_session(xid, pSesInfo, rc = cifs_setup_session(xid, pSesInfo,
cifs_sb->local_nls); cifs_sb->local_nls);
} }
up(&pSesInfo->sesSem); mutex_unlock(&pSesInfo->session_mutex);
} else if (!rc) { } else if (!rc) {
cFYI(1, ("Existing smb sess not found")); cFYI(1, ("Existing smb sess not found"));
pSesInfo = sesInfoAlloc(); pSesInfo = sesInfoAlloc();
@ -2437,12 +2437,12 @@ try_mount_again:
} }
pSesInfo->linux_uid = volume_info->linux_uid; pSesInfo->linux_uid = volume_info->linux_uid;
pSesInfo->overrideSecFlg = volume_info->secFlg; pSesInfo->overrideSecFlg = volume_info->secFlg;
down(&pSesInfo->sesSem); mutex_lock(&pSesInfo->session_mutex);
/* BB FIXME need to pass vol->secFlgs BB */ /* BB FIXME need to pass vol->secFlgs BB */
rc = cifs_setup_session(xid, pSesInfo, rc = cifs_setup_session(xid, pSesInfo,
cifs_sb->local_nls); cifs_sb->local_nls);
up(&pSesInfo->sesSem); mutex_unlock(&pSesInfo->session_mutex);
} }
/* search for existing tcon to this server share */ /* search for existing tcon to this server share */

2
fs/cifs/misc.c
View File

@ -79,7 +79,7 @@ sesInfoAlloc(void)
++ret_buf->ses_count; ++ret_buf->ses_count;
INIT_LIST_HEAD(&ret_buf->smb_ses_list); INIT_LIST_HEAD(&ret_buf->smb_ses_list);
INIT_LIST_HEAD(&ret_buf->tcon_list); INIT_LIST_HEAD(&ret_buf->tcon_list);
init_MUTEX(&ret_buf->sesSem); mutex_init(&ret_buf->session_mutex);
} }
return ret_buf; return ret_buf;
} }