From: Stefan Metzmacher Date: Mon, 18 Aug 2025 08:42:42 +0000 (+0200) Subject: smb: client: remove unused smbd_connection->protocol X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=87d03d6c829aea8c6cf632ac24ee5227c3b8b00b;p=users%2Fhch%2Fmisc.git smb: client: remove unused smbd_connection->protocol There is only one protocol version for smbdirect yet and this variable is write only. Cc: Steve French Cc: Tom Talpey Cc: Long Li Cc: linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org Acked-by: Namjae Jeon Signed-off-by: Stefan Metzmacher Signed-off-by: Steve French --- diff --git a/fs/smb/client/cifs_debug.c b/fs/smb/client/cifs_debug.c index 3086ab2622ba..e407bedd4aa7 100644 --- a/fs/smb/client/cifs_debug.c +++ b/fs/smb/client/cifs_debug.c @@ -24,6 +24,7 @@ #endif #ifdef CONFIG_CIFS_SMB_DIRECT #include "smbdirect.h" +#include "../common/smbdirect/smbdirect_pdu.h" #endif #include "cifs_swn.h" #include "cached_dir.h" @@ -458,7 +459,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) seq_printf(m, "\nSMBDirect protocol version: 0x%x " "transport status: %s (%u)", - server->smbd_conn->protocol, + SMBDIRECT_V1, smbdirect_socket_status_string(sc->status), sc->status); seq_printf(m, "\nConn receive_credit_max: %u " diff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c index efebc4aa297f..6c1bec769e88 100644 --- a/fs/smb/client/smbdirect.c +++ b/fs/smb/client/smbdirect.c @@ -481,7 +481,6 @@ static bool process_negotiation_response( le16_to_cpu(packet->negotiated_version)); return false; } - info->protocol = le16_to_cpu(packet->negotiated_version); if (packet->credits_requested == 0) { log_rdma_event(ERR, "error: credits_requested==0\n"); diff --git a/fs/smb/client/smbdirect.h b/fs/smb/client/smbdirect.h index 5f9ba769623b..90238a917256 100644 --- a/fs/smb/client/smbdirect.h +++ b/fs/smb/client/smbdirect.h @@ -39,8 +39,6 @@ extern int smbd_receive_credit_max; struct smbd_connection { struct smbdirect_socket socket; - /* dynamic connection parameters defined in [MS-SMBD] 3.1.1.1 */ - int protocol; /* Memory registrations */ /* Maximum number of pages in a single RDMA write/read on this connection */