Skip to content

Commit 1bfa25e

Browse files
author
Steve French
committed
cifs: remove remaining build warnings
Removed remaining warnings related to externs. These warnings although harmless could be distracting e.g. fs/cifs/cifsfs.c: note: in included file: fs/cifs/cifsglob.h:1968:24: warning: symbol 'sesInfoAllocCount' was not declared. Should it be static? Reviewed-by: Paulo Alcantara (SUSE) <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 9543c8a commit 1bfa25e

File tree

2 files changed

+30
-11
lines changed

2 files changed

+30
-11
lines changed

fs/cifs/cifsfs.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,25 @@ bool enable_negotiate_signing; /* false by default */
6868
unsigned int global_secflags = CIFSSEC_DEF;
6969
/* unsigned int ntlmv2_support = 0; */
7070
unsigned int sign_CIFS_PDUs = 1;
71+
72+
/*
73+
* Global transaction id (XID) information
74+
*/
75+
unsigned int GlobalCurrentXid; /* protected by GlobalMid_Sem */
76+
unsigned int GlobalTotalActiveXid; /* prot by GlobalMid_Sem */
77+
unsigned int GlobalMaxActiveXid; /* prot by GlobalMid_Sem */
78+
spinlock_t GlobalMid_Lock; /* protects above & list operations on midQ entries */
79+
80+
/*
81+
* Global counters, updated atomically
82+
*/
83+
atomic_t sesInfoAllocCount;
84+
atomic_t tconInfoAllocCount;
85+
atomic_t tcpSesNextId;
86+
atomic_t tcpSesAllocCount;
87+
atomic_t tcpSesReconnectCount;
88+
atomic_t tconInfoReconnectCount;
89+
7190
atomic_t mid_count;
7291
atomic_t buf_alloc_count;
7392
atomic_t small_buf_alloc_count;

fs/cifs/cifsglob.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1958,20 +1958,20 @@ extern spinlock_t cifs_tcp_ses_lock;
19581958
/*
19591959
* Global transaction id (XID) information
19601960
*/
1961-
GLOBAL_EXTERN unsigned int GlobalCurrentXid; /* protected by GlobalMid_Sem */
1962-
GLOBAL_EXTERN unsigned int GlobalTotalActiveXid; /* prot by GlobalMid_Sem */
1963-
GLOBAL_EXTERN unsigned int GlobalMaxActiveXid; /* prot by GlobalMid_Sem */
1964-
GLOBAL_EXTERN spinlock_t GlobalMid_Lock; /* protects above & list operations */
1965-
/* on midQ entries */
1961+
extern unsigned int GlobalCurrentXid; /* protected by GlobalMid_Sem */
1962+
extern unsigned int GlobalTotalActiveXid; /* prot by GlobalMid_Sem */
1963+
extern unsigned int GlobalMaxActiveXid; /* prot by GlobalMid_Sem */
1964+
extern spinlock_t GlobalMid_Lock; /* protects above & list operations on midQ entries */
1965+
19661966
/*
19671967
* Global counters, updated atomically
19681968
*/
1969-
GLOBAL_EXTERN atomic_t sesInfoAllocCount;
1970-
GLOBAL_EXTERN atomic_t tconInfoAllocCount;
1971-
GLOBAL_EXTERN atomic_t tcpSesNextId;
1972-
GLOBAL_EXTERN atomic_t tcpSesAllocCount;
1973-
GLOBAL_EXTERN atomic_t tcpSesReconnectCount;
1974-
GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
1969+
extern atomic_t sesInfoAllocCount;
1970+
extern atomic_t tconInfoAllocCount;
1971+
extern atomic_t tcpSesNextId;
1972+
extern atomic_t tcpSesAllocCount;
1973+
extern atomic_t tcpSesReconnectCount;
1974+
extern atomic_t tconInfoReconnectCount;
19751975

19761976
/* Various Debug counters */
19771977
extern atomic_t buf_alloc_count; /* current number allocated */

0 commit comments

Comments
 (0)