[cifs:for-next,15/16] fs//cifs/cifs_debug.c:178:9: warning: "CONFIG_CIFS_DEBUG" is not defined, evaluates to 0

Commit Message

Steve French June 29, 2018, 3:37 a.m. UTC

Updated patch


On Thu, Jun 28, 2018 at 8:34 PM kbuild test robot via samba-technical
<[e-mail]> wrote:
>
> tree:   git://git.samba.org/sfrench/cifs-2.6.git for-next
> head:   739943e0de624a14da460d879f714b9607beda78
> commit: fcff23e72c225da6a22bc0061d9fbeebf1f7fd48 [15/16] cifs: add missing debug entries for kconfig options
> config: x86_64-randconfig-x014-201825 (attached as .config)
> compiler: gcc-7 (Debian 7.3.0-16) 7.3.0
> reproduce:
>         git checkout fcff23e72c225da6a22bc0061d9fbeebf1f7fd48
>         # save the attached .config to linux build tree
>         make ARCH=x86_64
>
> All warnings (new ones prefixed by >>):
>
>    fs//cifs/cifs_debug.c: In function 'cifs_debug_data_proc_show':
> >> fs//cifs/cifs_debug.c:178:9: warning: "CONFIG_CIFS_DEBUG" is not defined, evaluates to 0 [-Wundef]
>     #elif   CONFIG_CIFS_DEBUG
>             ^~~~~~~~~~~~~~~~~
>
> vim +/CONFIG_CIFS_DEBUG +178 fs//cifs/cifs_debug.c
>
>    147
>    148  static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
>    149  {
>    150          struct list_head *tmp1, *tmp2, *tmp3;
>    151          struct mid_q_entry *mid_entry;
>    152          struct TCP_Server_Info *server;
>    153          struct cifs_ses *ses;
>    154          struct cifs_tcon *tcon;
>    155          int i, j;
>    156
>    157          seq_puts(m,
>    158                      "Display Internal CIFS Data Structures for Debugging\n"
>    159                      "---------------------------------------------------\n");
>    160          seq_printf(m, "CIFS Version %s\n", CIFS_VERSION);
>    161          seq_printf(m, "Features:");
>    162  #ifdef CONFIG_CIFS_DFS_UPCALL
>    163          seq_printf(m, " DFS");
>    164  #endif
>    165  #ifdef CONFIG_CIFS_FSCACHE
>    166          seq_printf(m, ",FSCACHE");
>    167  #endif
>    168  #ifdef CONFIG_CIFS_SMB_DIRECT
>    169          seq_printf(m, ",SMB_DIRECT");
>    170  #endif
>    171  #ifdef  CONFIG_CIFS_STATS2
>    172          seq_printf(m, ",STATS2");
>    173  #elif   CONFIG_CIFS_STATS
>    174          seq_printf(m, ",STATS");
>    175  #endif
>    176  #ifdef  CONFIG_CIFS_DEBUG2
>    177          seq_printf(m, ",DEBUG2");
>  > 178  #elif   CONFIG_CIFS_DEBUG
>    179          seq_printf(m, ",DEBUG");
>    180  #endif
>    181  #ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY
>    182          seq_printf(m, ",ALLOW_INSECURE_LEGACY");
>    183  #endif
>    184  #ifdef CONFIG_CIFS_WEAK_PW_HASH
>    185          seq_printf(m, ",WEAK_PW_HASH");
>    186  #endif
>    187  #ifdef CONFIG_CIFS_POSIX
>    188          seq_printf(m, ",CIFS_POSIX");
>    189  #endif
>    190  #ifdef CONFIG_CIFS_UPCALL
>    191          seq_printf(m, ",UPCALL(SPNEGO)");
>    192  #endif
>    193  #ifdef CONFIG_CIFS_XATTR
>    194          seq_printf(m, ",XATTR");
>    195  #endif
>    196  #ifdef CONFIG_CIFS_ACL
>    197          seq_printf(m, ",ACL");
>    198  #endif
>    199          seq_putc(m, '\n');
>    200          seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid);
>    201          seq_printf(m, "Servers:");
>    202
>    203          i = 0;
>    204          spin_lock(&cifs_tcp_ses_lock);
>    205          list_for_each(tmp1, &cifs_tcp_ses_list) {
>    206                  server = list_entry(tmp1, struct TCP_Server_Info,
>    207                                      tcp_ses_list);
>    208
>
> ---
> 0-DAY kernel test infrastructure                Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Patch

From fcff23e72c225da6a22bc0061d9fbeebf1f7fd48 Mon Sep 17 00:00:00 2001
From: Steve French <[e-mail]>
Date: Thu, 28 Jun 2018 18:46:40 -0500
Subject: [PATCH 1/2] cifs: add missing debug entries for kconfig options

/proc/fs/cifs/DebugData displays the features (Kconfig options)
used to build cifs.ko but it was missing some, and needed comma
separator.  These can be useful in debugging certain problems
so we know which optional features were enabled in the user's build.
Also clarify them, by making them more closely match the
corresponding CONFIG_CIFS_* parm.

Old format:
Features: dfs fscache posix spnego xattr acl

New format:
Features: DFS,FSCACHE,SMB_DIRECT,STATS,DEBUG2,ALLOW_INSECURE_LEGACY,CIFS_POSIX,UPCALL(SPNEGO),XATTR,ACL

Signed-off-by: Steve French <[e-mail]>
Reviewed-by: Ronnie Sahlberg <[e-mail]>
Reviewed-by: Paulo Alcantara <[e-mail]>
CC: Stable <[e-mail]>
---
 fs/cifs/cifs_debug.c | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index bfe999505815..72f72d1935b1 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -160,25 +160,41 @@  static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
 	seq_printf(m, "CIFS Version %s\n", CIFS_VERSION);
 	seq_printf(m, "Features:");
 #ifdef CONFIG_CIFS_DFS_UPCALL
-	seq_printf(m, " dfs");
+	seq_printf(m, " DFS");
 #endif
 #ifdef CONFIG_CIFS_FSCACHE
-	seq_printf(m, " fscache");
+	seq_printf(m, ",FSCACHE");
+#endif
+#ifdef CONFIG_CIFS_SMB_DIRECT
+	seq_printf(m, ",SMB_DIRECT");
+#endif
+#ifdef CONFIG_CIFS_STATS2
+	seq_printf(m, ",STATS2");
+#elif defined(CONFIG_CIFS_STATS)
+	seq_printf(m, ",STATS");
+#endif
+#ifdef CONFIG_CIFS_DEBUG2
+	seq_printf(m, ",DEBUG2");
+#elif defined(CONFIG_CIFS_DEBUG)
+	seq_printf(m, ",DEBUG");
+#endif
+#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY
+	seq_printf(m, ",ALLOW_INSECURE_LEGACY");
 #endif
 #ifdef CONFIG_CIFS_WEAK_PW_HASH
-	seq_printf(m, " lanman");
+	seq_printf(m, ",WEAK_PW_HASH");
 #endif
 #ifdef CONFIG_CIFS_POSIX
-	seq_printf(m, " posix");
+	seq_printf(m, ",CIFS_POSIX");
 #endif
 #ifdef CONFIG_CIFS_UPCALL
-	seq_printf(m, " spnego");
+	seq_printf(m, ",UPCALL(SPNEGO)");
 #endif
 #ifdef CONFIG_CIFS_XATTR
-	seq_printf(m, " xattr");
+	seq_printf(m, ",XATTR");
 #endif
 #ifdef CONFIG_CIFS_ACL
-	seq_printf(m, " acl");
+	seq_printf(m, ",ACL");
 #endif
 	seq_putc(m, '\n');
 	seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid);
-- 
2.17.1