[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>
This commit is contained in:
parent
3b79521093
commit
fb39601664
|
@ -204,7 +204,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
|
|||
else
|
||||
seq_printf(m, " type: %d ", dev_type);
|
||||
|
||||
if (tcon->tidStatus == CifsNeedReconnect)
|
||||
if (tcon->need_reconnect)
|
||||
seq_puts(m, "\tDISCONNECTED ");
|
||||
}
|
||||
read_unlock(&GlobalSMBSeslock);
|
||||
|
@ -311,7 +311,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
|
|||
i++;
|
||||
tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
|
||||
seq_printf(m, "\n%d) %s", i, tcon->treeName);
|
||||
if (tcon->tidStatus == CifsNeedReconnect)
|
||||
if (tcon->need_reconnect)
|
||||
seq_puts(m, "\tDISCONNECTED ");
|
||||
seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
|
||||
atomic_read(&tcon->num_smbs_sent),
|
||||
|
|
|
@ -1059,9 +1059,9 @@ init_cifs(void)
|
|||
{
|
||||
int rc = 0;
|
||||
cifs_proc_init();
|
||||
/* INIT_LIST_HEAD(&GlobalServerList);*/ /* BB not implemented yet */
|
||||
INIT_LIST_HEAD(&GlobalSMBSessionList);
|
||||
INIT_LIST_HEAD(&GlobalTreeConnectionList);
|
||||
INIT_LIST_HEAD(&global_cifs_sock_list);
|
||||
INIT_LIST_HEAD(&GlobalSMBSessionList); /* BB to be removed by jl */
|
||||
INIT_LIST_HEAD(&GlobalTreeConnectionList); /* BB to be removed by jl */
|
||||
INIT_LIST_HEAD(&GlobalOplock_Q);
|
||||
#ifdef CONFIG_CIFS_EXPERIMENTAL
|
||||
INIT_LIST_HEAD(&GlobalDnotifyReqList);
|
||||
|
|
|
@ -592,22 +592,15 @@ require use of the stronger protocol */
|
|||
#define GLOBAL_EXTERN extern
|
||||
#endif
|
||||
|
||||
/*
|
||||
* The list of servers that did not respond with NT LM 0.12.
|
||||
* This list helps improve performance and eliminate the messages indicating
|
||||
* that we had a communications error talking to the server in this list.
|
||||
*/
|
||||
/* Feature not supported */
|
||||
/* GLOBAL_EXTERN struct servers_not_supported *NotSuppList; */
|
||||
|
||||
/*
|
||||
* The following is a hash table of all the users we know about.
|
||||
*/
|
||||
GLOBAL_EXTERN struct smbUidInfo *GlobalUidList[UID_HASH];
|
||||
|
||||
/* GLOBAL_EXTERN struct list_head GlobalServerList; BB not implemented yet */
|
||||
GLOBAL_EXTERN struct list_head GlobalSMBSessionList;
|
||||
GLOBAL_EXTERN struct list_head GlobalTreeConnectionList;
|
||||
/* the list of TCP_Server_Info structures, ie each of the sockets
|
||||
* connecting our client to a distinct server (ip address), is
|
||||
* chained together by global_cifs_sock_list. The list of all our SMB
|
||||
* sessions (and from that the tree connections) can be found
|
||||
* by iterating over global_cifs_sock_list */
|
||||
GLOBAL_EXTERN struct list_head global_cifs_sock_list;
|
||||
GLOBAL_EXTERN struct list_head GlobalSMBSessionList; /* BB to be removed by jl*/
|
||||
GLOBAL_EXTERN struct list_head GlobalTreeConnectionList; /* BB to be removed */
|
||||
GLOBAL_EXTERN rwlock_t GlobalSMBSeslock; /* protects list inserts on 3 above */
|
||||
|
||||
GLOBAL_EXTERN struct list_head GlobalOplock_Q;
|
||||
|
|
Loading…
Reference in New Issue