cifs: add missing debug entries for kconfig options (950132af) · Commits · 戴 / test

/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 <stfrench@microsoft.com> Reviewed-by:

Ronnie Sahlberg <lsahlber@redhat.com> Reviewed-by:

Pavel Shilovsky <pshilov@microsoft.com> Reviewed-by:

Paulo Alcantara <palcantara@suse.de> CC: Stable <stable@vger.kernel.org>

fs/cifs/cifs_debug.c

+23 −7

Original line number	Diff line number	Diff line
		@@ -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);

Admin message