cifs: clarify hostname vs ip address in /proc/fs/cifs/DebugData
authorSteve French <stfrench@microsoft.com>
Mon, 22 Feb 2021 05:00:46 +0000 (23:00 -0600)
committerSteve French <stfrench@microsoft.com>
Tue, 23 Feb 2021 03:20:44 +0000 (21:20 -0600)
/proc/fs/cifs/DebugData called the ip address for server sessions
"Name" which is confusing since it is not a hostname. Change
this field name to "Address" and for the list of servers add
new field "Hostname" which is populated from the hostname used
to connect to the server.  See below. And also don't print
[NONE] when the interface list is empty as it is not clear
what 'NONE' referred to.

Servers:
1) ConnectionId: 0x1 Hostname: localhost
Number of credits: 389 Dialect 0x311
TCP status: 1 Instance: 1
Local Users To Server: 1 SecMode: 0x1 Req On Wire: 0
In Send: 0 In MaxReq Wait: 0

Sessions:
1) Address: 127.0.0.1
...

Reviewed-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/cifs/cifs_debug.c

index 1048180f4722618056a8cf652e7b2c940fba7534..02e007d0939df96641b67e6e2b0ae935d335a3c7 100644 (file)
@@ -293,6 +293,8 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
                seq_printf(m, "\n%d) ConnectionId: 0x%llx ",
                        c, server->conn_id);
 
+               if (server->hostname)
+                       seq_printf(m, "Hostname: %s ", server->hostname);
 #ifdef CONFIG_CIFS_SMB_DIRECT
                if (!server->rdma)
                        goto skip_rdma;
@@ -394,7 +396,7 @@ skip_rdma:
                        if ((ses->serverDomain == NULL) ||
                                (ses->serverOS == NULL) ||
                                (ses->serverNOS == NULL)) {
-                               seq_printf(m, "\n\t%d) Name: %s Uses: %d Capability: 0x%x\tSession Status: %d ",
+                               seq_printf(m, "\n\t%d) Address: %s Uses: %d Capability: 0x%x\tSession Status: %d ",
                                        i, ses->ip_addr, ses->ses_count,
                                        ses->capabilities, ses->status);
                                if (ses->session_flags & SMB2_SESSION_FLAG_IS_GUEST)
@@ -462,8 +464,6 @@ skip_rdma:
                                if (is_ses_using_iface(ses, iface))
                                        seq_puts(m, "\t\t[CONNECTED]\n");
                        }
-                       if (j == 0)
-                               seq_printf(m, "\n\t[NONE]");
                        spin_unlock(&ses->iface_lock);
                }
                if (i == 0)