aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-11-13 15:04:07 -0500
committerSteve French <sfrench@us.ibm.com>2008-11-13 15:04:07 -0500
commitfb396016647ae9de5b3bd8c4ee4f7b9cc7148bd5 (patch)
tree40ddde820d7c05b09ee130ef18477ecb50d4c61a
parent3b7952109361c684caf0c50474da8662ecc81019 (diff)
[CIFS] remove unused list, add new cifs sock list to prepare for mount/umount fix
Also adds two lines missing from the previous patch (for the need reconnect flag in the /proc/fs/cifs/DebugData handling) The new global_cifs_sock_list is added, and initialized in init_cifs but not used yet. Jeff Layton will be adding code in to use that and to remove the GlobalTcon and GlobalSMBSession lists. CC: Jeff Layton <jlayton@redhat.com> CC: Shirish Pargaonkar <shirishp@us.ibm.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r--fs/cifs/cifs_debug.c4
-rw-r--r--fs/cifs/cifsfs.c6
-rw-r--r--fs/cifs/cifsglob.h23
3 files changed, 13 insertions, 20 deletions
diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 69a12aae91d3..ba8723d95996 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -204,7 +204,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
204 else 204 else
205 seq_printf(m, " type: %d ", dev_type); 205 seq_printf(m, " type: %d ", dev_type);
206 206
207 if (tcon->tidStatus == CifsNeedReconnect) 207 if (tcon->need_reconnect)
208 seq_puts(m, "\tDISCONNECTED "); 208 seq_puts(m, "\tDISCONNECTED ");
209 } 209 }
210 read_unlock(&GlobalSMBSeslock); 210 read_unlock(&GlobalSMBSeslock);
@@ -311,7 +311,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
311 i++; 311 i++;
312 tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList); 312 tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
313 seq_printf(m, "\n%d) %s", i, tcon->treeName); 313 seq_printf(m, "\n%d) %s", i, tcon->treeName);
314 if (tcon->tidStatus == CifsNeedReconnect) 314 if (tcon->need_reconnect)
315 seq_puts(m, "\tDISCONNECTED "); 315 seq_puts(m, "\tDISCONNECTED ");
316 seq_printf(m, "\nSMBs: %d Oplock Breaks: %d", 316 seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
317 atomic_read(&tcon->num_smbs_sent), 317 atomic_read(&tcon->num_smbs_sent),
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 903bbd6449d1..af16a2406b1c 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -1059,9 +1059,9 @@ init_cifs(void)
1059{ 1059{
1060 int rc = 0; 1060 int rc = 0;
1061 cifs_proc_init(); 1061 cifs_proc_init();
1062/* INIT_LIST_HEAD(&GlobalServerList);*/ /* BB not implemented yet */ 1062 INIT_LIST_HEAD(&global_cifs_sock_list);
1063 INIT_LIST_HEAD(&GlobalSMBSessionList); 1063 INIT_LIST_HEAD(&GlobalSMBSessionList); /* BB to be removed by jl */
1064 INIT_LIST_HEAD(&GlobalTreeConnectionList); 1064 INIT_LIST_HEAD(&GlobalTreeConnectionList); /* BB to be removed by jl */
1065 INIT_LIST_HEAD(&GlobalOplock_Q); 1065 INIT_LIST_HEAD(&GlobalOplock_Q);
1066#ifdef CONFIG_CIFS_EXPERIMENTAL 1066#ifdef CONFIG_CIFS_EXPERIMENTAL
1067 INIT_LIST_HEAD(&GlobalDnotifyReqList); 1067 INIT_LIST_HEAD(&GlobalDnotifyReqList);
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index dc0aa140f1bf..d6357dc1be72 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -592,22 +592,15 @@ require use of the stronger protocol */
592#define GLOBAL_EXTERN extern 592#define GLOBAL_EXTERN extern
593#endif 593#endif
594 594
595/*
596 * The list of servers that did not respond with NT LM 0.12.
597 * This list helps improve performance and eliminate the messages indicating
598 * that we had a communications error talking to the server in this list.
599 */
600/* Feature not supported */
601/* GLOBAL_EXTERN struct servers_not_supported *NotSuppList; */
602
603/*
604 * The following is a hash table of all the users we know about.
605 */
606GLOBAL_EXTERN struct smbUidInfo *GlobalUidList[UID_HASH];
607 595
608/* GLOBAL_EXTERN struct list_head GlobalServerList; BB not implemented yet */ 596/* the list of TCP_Server_Info structures, ie each of the sockets
609GLOBAL_EXTERN struct list_head GlobalSMBSessionList; 597 * connecting our client to a distinct server (ip address), is
610GLOBAL_EXTERN struct list_head GlobalTreeConnectionList; 598 * chained together by global_cifs_sock_list. The list of all our SMB
599 * sessions (and from that the tree connections) can be found
600 * by iterating over global_cifs_sock_list */
601GLOBAL_EXTERN struct list_head global_cifs_sock_list;
602GLOBAL_EXTERN struct list_head GlobalSMBSessionList; /* BB to be removed by jl*/
603GLOBAL_EXTERN struct list_head GlobalTreeConnectionList; /* BB to be removed */
611GLOBAL_EXTERN rwlock_t GlobalSMBSeslock; /* protects list inserts on 3 above */ 604GLOBAL_EXTERN rwlock_t GlobalSMBSeslock; /* protects list inserts on 3 above */
612 605
613GLOBAL_EXTERN struct list_head GlobalOplock_Q; 606GLOBAL_EXTERN struct list_head GlobalOplock_Q;