projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 973db825 GKH |
1 | From 950132afd59385caf6e2b84e5235d069fa10681d Mon Sep 17 00:00:00 2001 |
| 2 | From: Steve French <stfrench@microsoft.com> | |
| 3 | Date: Thu, 28 Jun 2018 18:46:40 -0500 | |
| 4 | Subject: cifs: add missing debug entries for kconfig options | |
| 5 | ||
| 6 | From: Steve French <stfrench@microsoft.com> | |
| 7 | ||
| 8 | commit 950132afd59385caf6e2b84e5235d069fa10681d upstream. | |
| 9 | ||
| 10 | /proc/fs/cifs/DebugData displays the features (Kconfig options) | |
| 11 | used to build cifs.ko but it was missing some, and needed comma | |
| 12 | separator. These can be useful in debugging certain problems | |
| 13 | so we know which optional features were enabled in the user's build. | |
| 14 | Also clarify them, by making them more closely match the | |
| 15 | corresponding CONFIG_CIFS_* parm. | |
| 16 | ||
| 17 | Old format: | |
| 18 | Features: dfs fscache posix spnego xattr acl | |
| 19 | ||
| 20 | New format: | |
| 21 | Features: DFS,FSCACHE,SMB_DIRECT,STATS,DEBUG2,ALLOW_INSECURE_LEGACY,CIFS_POSIX,UPCALL(SPNEGO),XATTR,ACL | |
| 22 | ||
| 23 | Signed-off-by: Steve French <stfrench@microsoft.com> | |
| 24 | Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com> | |
| 25 | Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> | |
| 26 | Reviewed-by: Paulo Alcantara <palcantara@suse.de> | |
| 27 | CC: Stable <stable@vger.kernel.org> | |
| 28 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 29 | ||
| 30 | --- | |
| 31 | fs/cifs/cifs_debug.c | 30 +++++++++++++++++++++++------- | |
| 32 | 1 file changed, 23 insertions(+), 7 deletions(-) | |
| 33 | ||
| 34 | --- a/fs/cifs/cifs_debug.c | |
| 35 | +++ b/fs/cifs/cifs_debug.c | |
| 36 | @@ -123,25 +123,41 @@ static int cifs_debug_data_proc_show(str | |
| 37 | seq_printf(m, "CIFS Version %s\n", CIFS_VERSION); | |
| 38 | seq_printf(m, "Features:"); | |
| 39 | #ifdef CONFIG_CIFS_DFS_UPCALL | |
| 40 | - seq_printf(m, " dfs"); | |
| 41 | + seq_printf(m, " DFS"); | |
| 42 | #endif | |
| 43 | #ifdef CONFIG_CIFS_FSCACHE | |
| 44 | - seq_printf(m, " fscache"); | |
| 45 | + seq_printf(m, ",FSCACHE"); | |
| 46 | +#endif | |
| 47 | +#ifdef CONFIG_CIFS_SMB_DIRECT | |
| 48 | + seq_printf(m, ",SMB_DIRECT"); | |
| 49 | +#endif | |
| 50 | +#ifdef CONFIG_CIFS_STATS2 | |
| 51 | + seq_printf(m, ",STATS2"); | |
| 52 | +#elif defined(CONFIG_CIFS_STATS) | |
| 53 | + seq_printf(m, ",STATS"); | |
| 54 | +#endif | |
| 55 | +#ifdef CONFIG_CIFS_DEBUG2 | |
| 56 | + seq_printf(m, ",DEBUG2"); | |
| 57 | +#elif defined(CONFIG_CIFS_DEBUG) | |
| 58 | + seq_printf(m, ",DEBUG"); | |
| 59 | +#endif | |
| 60 | +#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY | |
| 61 | + seq_printf(m, ",ALLOW_INSECURE_LEGACY"); | |
| 62 | #endif | |
| 63 | #ifdef CONFIG_CIFS_WEAK_PW_HASH | |
| 64 | - seq_printf(m, " lanman"); | |
| 65 | + seq_printf(m, ",WEAK_PW_HASH"); | |
| 66 | #endif | |
| 67 | #ifdef CONFIG_CIFS_POSIX | |
| 68 | - seq_printf(m, " posix"); | |
| 69 | + seq_printf(m, ",CIFS_POSIX"); | |
| 70 | #endif | |
| 71 | #ifdef CONFIG_CIFS_UPCALL | |
| 72 | - seq_printf(m, " spnego"); | |
| 73 | + seq_printf(m, ",UPCALL(SPNEGO)"); | |
| 74 | #endif | |
| 75 | #ifdef CONFIG_CIFS_XATTR | |
| 76 | - seq_printf(m, " xattr"); | |
| 77 | + seq_printf(m, ",XATTR"); | |
| 78 | #endif | |
| 79 | #ifdef CONFIG_CIFS_ACL | |
| 80 | - seq_printf(m, " acl"); | |
| 81 | + seq_printf(m, ",ACL"); | |
| 82 | #endif | |
| 83 | seq_putc(m, '\n'); | |
| 84 | seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid); |