Skip to content

Commit afff34d

Browse files
metze-sambasmfrench
authored andcommitted
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 <[email protected]> Cc: Tom Talpey <[email protected]> Cc: Long Li <[email protected]> Cc: [email protected] Cc: [email protected] Acked-by: Namjae Jeon <[email protected]> Signed-off-by: Stefan Metzmacher <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent f5b893e commit afff34d

File tree

1 file changed

+24
-23
lines changed

1 file changed

+24
-23
lines changed

fs/smb/client/cifs_debug.c

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -456,55 +456,56 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
456456
sc = &server->smbd_conn->socket;
457457
sp = &sc->parameters;
458458

459-
seq_printf(m, "\nSMBDirect (in hex) protocol version: %x "
460-
"transport status: %x",
459+
seq_printf(m, "\nSMBDirect protocol version: 0x%x "
460+
"transport status: %s (%u)",
461461
server->smbd_conn->protocol,
462-
server->smbd_conn->socket.status);
463-
seq_printf(m, "\nConn receive_credit_max: %x "
464-
"send_credit_target: %x max_send_size: %x",
462+
smbdirect_socket_status_string(sc->status),
463+
sc->status);
464+
seq_printf(m, "\nConn receive_credit_max: %u "
465+
"send_credit_target: %u max_send_size: %u",
465466
sp->recv_credit_max,
466467
sp->send_credit_target,
467468
sp->max_send_size);
468-
seq_printf(m, "\nConn max_fragmented_recv_size: %x "
469-
"max_fragmented_send_size: %x max_receive_size:%x",
469+
seq_printf(m, "\nConn max_fragmented_recv_size: %u "
470+
"max_fragmented_send_size: %u max_receive_size:%u",
470471
sp->max_fragmented_recv_size,
471472
sp->max_fragmented_send_size,
472473
sp->max_recv_size);
473-
seq_printf(m, "\nConn keep_alive_interval: %x "
474-
"max_readwrite_size: %x rdma_readwrite_threshold: %x",
474+
seq_printf(m, "\nConn keep_alive_interval: %u "
475+
"max_readwrite_size: %u rdma_readwrite_threshold: %u",
475476
sp->keepalive_interval_msec * 1000,
476477
sp->max_read_write_size,
477478
server->smbd_conn->rdma_readwrite_threshold);
478-
seq_printf(m, "\nDebug count_get_receive_buffer: %x "
479-
"count_put_receive_buffer: %x count_send_empty: %x",
479+
seq_printf(m, "\nDebug count_get_receive_buffer: %u "
480+
"count_put_receive_buffer: %u count_send_empty: %u",
480481
server->smbd_conn->count_get_receive_buffer,
481482
server->smbd_conn->count_put_receive_buffer,
482483
server->smbd_conn->count_send_empty);
483-
seq_printf(m, "\nRead Queue count_reassembly_queue: %x "
484-
"count_enqueue_reassembly_queue: %x "
485-
"count_dequeue_reassembly_queue: %x "
486-
"reassembly_data_length: %x "
487-
"reassembly_queue_length: %x",
484+
seq_printf(m, "\nRead Queue count_reassembly_queue: %u "
485+
"count_enqueue_reassembly_queue: %u "
486+
"count_dequeue_reassembly_queue: %u "
487+
"reassembly_data_length: %u "
488+
"reassembly_queue_length: %u",
488489
server->smbd_conn->count_reassembly_queue,
489490
server->smbd_conn->count_enqueue_reassembly_queue,
490491
server->smbd_conn->count_dequeue_reassembly_queue,
491492
sc->recv_io.reassembly.data_length,
492493
sc->recv_io.reassembly.queue_length);
493-
seq_printf(m, "\nCurrent Credits send_credits: %x "
494-
"receive_credits: %x receive_credit_target: %x",
494+
seq_printf(m, "\nCurrent Credits send_credits: %u "
495+
"receive_credits: %u receive_credit_target: %u",
495496
atomic_read(&server->smbd_conn->send_credits),
496497
atomic_read(&server->smbd_conn->receive_credits),
497498
server->smbd_conn->receive_credit_target);
498-
seq_printf(m, "\nPending send_pending: %x ",
499+
seq_printf(m, "\nPending send_pending: %u ",
499500
atomic_read(&server->smbd_conn->send_pending));
500-
seq_printf(m, "\nReceive buffers count_receive_queue: %x ",
501+
seq_printf(m, "\nReceive buffers count_receive_queue: %u ",
501502
server->smbd_conn->count_receive_queue);
502-
seq_printf(m, "\nMR responder_resources: %x "
503-
"max_frmr_depth: %x mr_type: %x",
503+
seq_printf(m, "\nMR responder_resources: %u "
504+
"max_frmr_depth: %u mr_type: 0x%x",
504505
server->smbd_conn->responder_resources,
505506
server->smbd_conn->max_frmr_depth,
506507
server->smbd_conn->mr_type);
507-
seq_printf(m, "\nMR mr_ready_count: %x mr_used_count: %x",
508+
seq_printf(m, "\nMR mr_ready_count: %u mr_used_count: %u",
508509
atomic_read(&server->smbd_conn->mr_ready_count),
509510
atomic_read(&server->smbd_conn->mr_used_count));
510511
skip_rdma:

0 commit comments

Comments
 (0)