Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 7 insertions, 2 deletions

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 9727e1dcacd5..cbb9534b89b4 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -160,8 +160,13 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
                         if ((ses->serverDomain == NULL) ||
                                 (ses->serverOS == NULL) ||
                                 (ses->serverNOS == NULL)) {
-                                seq_printf(m, "\n%d) entry for %s not fully "
-                                           "displayed\n\t", i, ses->serverName);
+                                seq_printf(m, "\n%d) Name: %s Uses: %d Capability: 0x%x\tSession Status: %d\t",
+                                        i, ses->serverName, ses->ses_count,
+                                        ses->capabilities, ses->status);
+                                if (ses->session_flags & SMB2_SESSION_FLAG_IS_GUEST)
+                                        seq_printf(m, "Guest\t");
+                                else if (ses->session_flags & SMB2_SESSION_FLAG_IS_NULL)
+                                        seq_printf(m, "Anonymous\t");
                         } else {
                                 seq_printf(m,
                                     "\n%d) Name: %s  Domain: %s Uses: %d OS:"