diff options
| author | Stefan Metzmacher <metze@samba.org> | 2025-08-19 12:03:59 +0200 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2025-09-28 18:29:49 -0500 |
| commit | 2449c7cc9bc26f8c80560f376f26c6f50b346c0f (patch) | |
| tree | 0b27123822d70b4b5bcdc416da63e6d77c8d98a3 | |
| parent | smb: client: remove unused smbd_connection->protocol (diff) | |
| download | linux-2449c7cc9bc26f8c80560f376f26c6f50b346c0f.tar.gz linux-2449c7cc9bc26f8c80560f376f26c6f50b346c0f.zip | |
smb: client: remove unused smbd_connection.count_reassembly_queue
This basically represents the same information as
sc->recv_io.reassembly.queue_length.
The only thing that's different is that
smbd_connection.count_reassembly_queue was updated in each
loop step, while sc->recv_io.reassembly.queue_length is only
updated once after the loop in smbd_recv.
Also sc->recv_io.reassembly.queue_length is updated under
a spinlock.
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>
| -rw-r--r-- | fs/smb/client/cifs_debug.c | 3 | ||||
| -rw-r--r-- | fs/smb/client/smbdirect.c | 2 | ||||
| -rw-r--r-- | fs/smb/client/smbdirect.h | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/fs/smb/client/cifs_debug.c b/fs/smb/client/cifs_debug.c index e407bedd4aa7..7cf3b045d3fb 100644 --- a/fs/smb/client/cifs_debug.c +++ b/fs/smb/client/cifs_debug.c @@ -482,12 +482,11 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 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: %u " + seq_printf(m, "\nRead Queue " "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, diff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c index 6c1bec769e88..40a423de0e87 100644 --- a/fs/smb/client/smbdirect.c +++ b/fs/smb/client/smbdirect.c @@ -1353,7 +1353,6 @@ static void enqueue_reassembly( virt_wmb(); sc->recv_io.reassembly.data_length += data_length; spin_unlock(&sc->recv_io.reassembly.lock); - info->count_reassembly_queue++; info->count_enqueue_reassembly_queue++; } @@ -2079,7 +2078,6 @@ again: &sc->recv_io.reassembly.lock); } queue_removed++; - info->count_reassembly_queue--; info->count_dequeue_reassembly_queue++; put_receive_buffer(info, response); offset = 0; diff --git a/fs/smb/client/smbdirect.h b/fs/smb/client/smbdirect.h index 90238a917256..2b13fa92f2d9 100644 --- a/fs/smb/client/smbdirect.h +++ b/fs/smb/client/smbdirect.h @@ -66,7 +66,6 @@ struct smbd_connection { /* for debug purposes */ unsigned int count_get_receive_buffer; unsigned int count_put_receive_buffer; - unsigned int count_reassembly_queue; unsigned int count_enqueue_reassembly_queue; unsigned int count_dequeue_reassembly_queue; unsigned int count_send_empty; |