Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbd314e2 authored by Steve French's avatar Steve French Committed by Greg Kroah-Hartman
Browse files

cifs: add missing debug entries for kconfig options 



commit 950132afd59385caf6e2b84e5235d069fa10681d upstream.

/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: default avatarSteve French <stfrench@microsoft.com>
Reviewed-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Reviewed-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: default avatarPaulo Alcantara <palcantara@suse.de>
CC: Stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b653d47b

fs/cifs/cifs_debug.c

+23 −7
Original line number Diff line number Diff line
@@ -123,25 +123,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);