smb: client: adjust smbdirect related output of cifs_debug_data_proc_show()

For the reader it is not obvious that the counter values are displayed
in hex as there's no leading '0x' before '%x'.

So changed them to %u instead and added '0x' for non-counter values
and also a string for the status.

Note this generates some checkpatch warnings like this:

 WARNING: quoted string split across lines
 #45: FILE: fs/smb/client/cifs_debug.c:460:
 +               seq_printf(m, "\nSMBDirect protocol version: 0x%x "
 +                       "transport status: %s (%u)",

But I'll leave this is the current style in the
related code...

Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Long Li <longli@microsoft.com>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/cifs_debug.c b/fs/smb/client/cifs_debug.c
index 2337cf795db3f8f2f1f02d81a2618c9700cd02ef..265e063e95bd06e8cf8a5784064e340e99486e15 100644 (file)
--- a/fs/smb/client/cifs_debug.c
+++ b/fs/smb/client/cifs_debug.c
@@ -456,55 +456,56 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
                sc = &server->smbd_conn->socket;
                sp = &sc->parameters;
 
-               seq_printf(m, "\nSMBDirect (in hex) protocol version: %x "
-                       "transport status: %x",
+               seq_printf(m, "\nSMBDirect protocol version: 0x%x "
+                       "transport status: %s (%u)",
                        server->smbd_conn->protocol,
-                       server->smbd_conn->socket.status);
-               seq_printf(m, "\nConn receive_credit_max: %x "
-                       "send_credit_target: %x max_send_size: %x",
+                       smbdirect_socket_status_string(sc->status),
+                       sc->status);
+               seq_printf(m, "\nConn receive_credit_max: %u "
+                       "send_credit_target: %u max_send_size: %u",
                        sp->recv_credit_max,
                        sp->send_credit_target,
                        sp->max_send_size);
-               seq_printf(m, "\nConn max_fragmented_recv_size: %x "
-                       "max_fragmented_send_size: %x max_receive_size:%x",
+               seq_printf(m, "\nConn max_fragmented_recv_size: %u "
+                       "max_fragmented_send_size: %u max_receive_size:%u",
                        sp->max_fragmented_recv_size,
                        sp->max_fragmented_send_size,
                        sp->max_recv_size);
-               seq_printf(m, "\nConn keep_alive_interval: %x "
-                       "max_readwrite_size: %x rdma_readwrite_threshold: %x",
+               seq_printf(m, "\nConn keep_alive_interval: %u "
+                       "max_readwrite_size: %u rdma_readwrite_threshold: %u",
                        sp->keepalive_interval_msec * 1000,
                        sp->max_read_write_size,
                        server->smbd_conn->rdma_readwrite_threshold);
-               seq_printf(m, "\nDebug count_get_receive_buffer: %x "
-                       "count_put_receive_buffer: %x count_send_empty: %x",
+               seq_printf(m, "\nDebug count_get_receive_buffer: %u "
+                       "count_put_receive_buffer: %u count_send_empty: %u",
                        server->smbd_conn->count_get_receive_buffer,
                        server->smbd_conn->count_put_receive_buffer,
                        server->smbd_conn->count_send_empty);
-               seq_printf(m, "\nRead Queue count_reassembly_queue: %x "
-                       "count_enqueue_reassembly_queue: %x "
-                       "count_dequeue_reassembly_queue: %x "
-                       "reassembly_data_length: %x "
-                       "reassembly_queue_length: %x",
+               seq_printf(m, "\nRead Queue count_reassembly_queue: %u "
+                       "count_enqueue_reassembly_queue: %u "
+                       "count_dequeue_reassembly_queue: %u "
+                       "reassembly_data_length: %u "
+                       "reassembly_queue_length: %u",
                        server->smbd_conn->count_reassembly_queue,
                        server->smbd_conn->count_enqueue_reassembly_queue,
                        server->smbd_conn->count_dequeue_reassembly_queue,
                        sc->recv_io.reassembly.data_length,
                        sc->recv_io.reassembly.queue_length);
-               seq_printf(m, "\nCurrent Credits send_credits: %x "
-                       "receive_credits: %x receive_credit_target: %x",
+               seq_printf(m, "\nCurrent Credits send_credits: %u "
+                       "receive_credits: %u receive_credit_target: %u",
                        atomic_read(&server->smbd_conn->send_credits),
                        atomic_read(&server->smbd_conn->receive_credits),
                        server->smbd_conn->receive_credit_target);
-               seq_printf(m, "\nPending send_pending: %x ",
+               seq_printf(m, "\nPending send_pending: %u ",
                        atomic_read(&server->smbd_conn->send_pending));
-               seq_printf(m, "\nReceive buffers count_receive_queue: %x ",
+               seq_printf(m, "\nReceive buffers count_receive_queue: %u ",
                        server->smbd_conn->count_receive_queue);
-               seq_printf(m, "\nMR responder_resources: %x "
-                       "max_frmr_depth: %x mr_type: %x",
+               seq_printf(m, "\nMR responder_resources: %u "
+                       "max_frmr_depth: %u mr_type: 0x%x",
                        server->smbd_conn->responder_resources,
                        server->smbd_conn->max_frmr_depth,
                        server->smbd_conn->mr_type);
-               seq_printf(m, "\nMR mr_ready_count: %x mr_used_count: %x",
+               seq_printf(m, "\nMR mr_ready_count: %u mr_used_count: %u",
                        atomic_read(&server->smbd_conn->mr_ready_count),
                        atomic_read(&server->smbd_conn->mr_used_count));
 skip_rdma: