Skip to content

Commit 2449c7c

Browse files
metze-sambasmfrench
authored andcommitted
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>
1 parent 87d03d6 commit 2449c7c

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

fs/smb/client/cifs_debug.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,12 +482,11 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
482482
server->smbd_conn->count_get_receive_buffer,
483483
server->smbd_conn->count_put_receive_buffer,
484484
server->smbd_conn->count_send_empty);
485-
seq_printf(m, "\nRead Queue count_reassembly_queue: %u "
485+
seq_printf(m, "\nRead Queue "
486486
"count_enqueue_reassembly_queue: %u "
487487
"count_dequeue_reassembly_queue: %u "
488488
"reassembly_data_length: %u "
489489
"reassembly_queue_length: %u",
490-
server->smbd_conn->count_reassembly_queue,
491490
server->smbd_conn->count_enqueue_reassembly_queue,
492491
server->smbd_conn->count_dequeue_reassembly_queue,
493492
sc->recv_io.reassembly.data_length,

fs/smb/client/smbdirect.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,7 +1353,6 @@ static void enqueue_reassembly(
13531353
virt_wmb();
13541354
sc->recv_io.reassembly.data_length += data_length;
13551355
spin_unlock(&sc->recv_io.reassembly.lock);
1356-
info->count_reassembly_queue++;
13571356
info->count_enqueue_reassembly_queue++;
13581357
}
13591358

@@ -2079,7 +2078,6 @@ int smbd_recv(struct smbd_connection *info, struct msghdr *msg)
20792078
&sc->recv_io.reassembly.lock);
20802079
}
20812080
queue_removed++;
2082-
info->count_reassembly_queue--;
20832081
info->count_dequeue_reassembly_queue++;
20842082
put_receive_buffer(info, response);
20852083
offset = 0;

fs/smb/client/smbdirect.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ struct smbd_connection {
6666
/* for debug purposes */
6767
unsigned int count_get_receive_buffer;
6868
unsigned int count_put_receive_buffer;
69-
unsigned int count_reassembly_queue;
7069
unsigned int count_enqueue_reassembly_queue;
7170
unsigned int count_dequeue_reassembly_queue;
7271
unsigned int count_send_empty;

0 commit comments

Comments
 (0)