Missed one user...
Index: linux-2.5.43/fs/cifs/cifs_debug.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.43/fs/cifs/cifs_debug.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 cifs_debug.c
--- linux-2.5.43/fs/cifs/cifs_debug.c 16 Oct 2002 03:46:04 -0000 1.1.1.1
+++ linux-2.5.43/fs/cifs/cifs_debug.c 16 Oct 2002 05:55:05 -0000
@@ -79,6 +79,7 @@
buf += length;
i = 0;
+ down_read(&GlobalSMB_Sem);
list_for_each(tmp, &GlobalSMBSessionList) {
i++;
ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList);
@@ -91,6 +92,7 @@
ses->serverOS, ses->serverNOS, ses->capabilities);
buf += length;
}
+
sprintf(buf, "\n");
buf++;
printk("\nTotal Buffer so far: %s\n", buf_start);
@@ -122,6 +124,8 @@
tcon->fsDevInfo.DeviceType);
buf += length;
}
+ up_read(&GlobalSMB_Sem);
+
length = sprintf(buf, "\n");
buf += length;
*eof = 1;
Index: linux-2.5.43/fs/cifs/cifsglob.h
===================================================================
RCS file: /build/cvsroot/linux-2.5.43/fs/cifs/cifsglob.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 cifsglob.h
--- linux-2.5.43/fs/cifs/cifsglob.h 16 Oct 2002 03:46:04 -0000 1.1.1.1
+++ linux-2.5.43/fs/cifs/cifsglob.h 16 Oct 2002 05:55:05 -0000
@@ -292,6 +292,8 @@
*/
GLOBAL_EXTERN struct smbUidInfo *GlobalUidList[UID_HASH];
+/* The following are protected by GlobalSMB_Sem */
+GLOBAL_EXTERN struct rw_semaphore GlobalSMB_Sem;
GLOBAL_EXTERN struct list_head GlobalServerList; /* BB this one is not implemented yet */
GLOBAL_EXTERN struct list_head GlobalSMBSessionList;
GLOBAL_EXTERN struct list_head GlobalTreeConnectionList;
Index: linux-2.5.43/fs/cifs/connect.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.43/fs/cifs/connect.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 connect.c
--- linux-2.5.43/fs/cifs/connect.c 16 Oct 2002 03:46:04 -0000 1.1.1.1
+++ linux-2.5.43/fs/cifs/connect.c 16 Oct 2002 05:56:17 -0000
@@ -256,12 +256,14 @@
}
/* BB add code to lock SMB sessions while releasing */
if(server->ssocket) {
- sock_release(csocket);
- server->ssocket = NULL;
- }
+ sock_release(csocket);
+ server->ssocket = NULL;
+ }
set_fs(temp_fs);
if (smb_buffer) /* buffer usually freed in free_mid - need to free it on error or exit */
buf_release(smb_buffer);
+
+ down_write(&GlobalSMB_Sem);
if (list_empty(&server->pending_mid_q)) {
/* loop through server session structures attached to this and mark them dead */
list_for_each(tmp, &GlobalSMBSessionList) {
@@ -281,6 +283,7 @@
time out and then free the tcp per server struct BB */
cFYI(1, ("\nAbout to exit from demultiplex thread\n"));
+ up_write(&GlobalSMB_Sem);
return 0;
}
@@ -422,6 +425,7 @@
*psrvTcp = NULL;
+ down_read(&GlobalSMB_Sem);
list_for_each(tmp, &GlobalSMBSessionList) {
ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList);
if (ses->server) {
@@ -432,12 +436,15 @@
/* BB check if reconnection needed */
if (strncmp
(ses->userName, userName,
- MAX_USERNAME_SIZE) == 0)
+ MAX_USERNAME_SIZE) == 0) {
+ up_read(&GlobalSMB_Sem);
return ses; /* found exact match on both tcp and SMB sessions */
+ }
}
}
/* else tcp and smb sessions need reconnection */
}
+ up_read(&GlobalSMB_Sem);
return NULL;
}
@@ -447,6 +454,7 @@
struct list_head *tmp;
struct cifsTconInfo *tcon;
+ down_read(&GlobalSMB_Sem);
list_for_each(tmp, &GlobalTreeConnectionList) {
cFYI(1, ("\nNext tcon - "));
tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
@@ -473,13 +481,16 @@
if (strncmp
(tcon->ses->userName,
userName,
- MAX_USERNAME_SIZE) == 0)
+ MAX_USERNAME_SIZE) == 0) {
+ up_read(&GlobalSMB_Sem);
return tcon;/* also matched user (smb session)*/
+ }
}
}
}
}
}
+ up_read(&GlobalSMB_Sem);
return NULL;
}
Index: linux-2.5.43/fs/cifs/misc.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.43/fs/cifs/misc.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 misc.c
--- linux-2.5.43/fs/cifs/misc.c 16 Oct 2002 03:46:04 -0000 1.1.1.1
+++ linux-2.5.43/fs/cifs/misc.c 16 Oct 2002 05:55:05 -0000
@@ -29,6 +29,7 @@
extern kmem_cache_t *cifs_req_cachep;
static DECLARE_MUTEX(GlobalMid_Sem); /* also protects XID globals */
+static DECLARE_RWSEM(GlobalSMB_Sem); /* protects SMB/TCP session lists */
__u16 GlobalMid; /* multiplex id - rotating counter */
/* The xid serves as a useful identifier for each incoming vfs request,
@@ -70,7 +71,9 @@
if (ret_buf) {
memset(ret_buf, 0, sizeof (struct cifsSesInfo));
atomic_inc(&sesInfoAllocCount);
+ down_write(&GlobalSMB_Sem);
list_add(&ret_buf->cifsSessionList, &GlobalSMBSessionList);
+ up_write(&GlobalSMB_Sem);
init_MUTEX(&ret_buf->sesSem);
}
return ret_buf;
@@ -105,9 +108,11 @@
if (ret_buf) {
memset(ret_buf, 0, sizeof (struct cifsTconInfo));
atomic_inc(&tconInfoAllocCount);
+ down_write(&GlobalSMB_Sem);
list_add(&ret_buf->cifsConnectionList,
&GlobalTreeConnectionList);
- INIT_LIST_HEAD(&ret_buf->openFileList);
+ up_write(&GlobalSMB_Sem);
+ INIT_LIST_HEAD(&ret_buf->openFileList);
init_MUTEX(&ret_buf->tconSem);
}
return ret_buf;
-- function.linuxpower.ca- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Oct 23 2002 - 22:00:26 EST