Merge commit 'linus/master' into bkl/core

[karo-tx-linux.git] / fs / cifs / cifs_debug.c

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 4fce6e61b34e9e889fae5fdbfbf938a7526b8ccb..eb1ba493489f855cbbcdd905687292fbbbdbfc64 100644 (file)
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -119,6 +119,31 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
                    "Display Internal CIFS Data Structures for Debugging\n"
                    "---------------------------------------------------\n");
        seq_printf(m, "CIFS Version %s\n", CIFS_VERSION);
+       seq_printf(m, "Features: ");
+#ifdef CONFIG_CIFS_DFS_UPCALL
+       seq_printf(m, "dfs");
+       seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_FSCACHE
+       seq_printf(m, "fscache");
+       seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_WEAK_PW_HASH
+       seq_printf(m, "lanman");
+       seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_POSIX
+       seq_printf(m, "posix");
+       seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_UPCALL
+       seq_printf(m, "spnego");
+       seq_putc(m, ' ');
+#endif
+#ifdef CONFIG_CIFS_XATTR
+       seq_printf(m, "xattr");
+#endif
+       seq_putc(m, '\n');
        seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid);
        seq_printf(m, "Servers:");