diff options
| author | Stefan Metzmacher <metze@samba.org> | 2025-11-13 15:10:24 +0300 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2026-04-16 05:58:20 +0300 |
| commit | 84df3cde16090d5d1de4df31623ef0433fdea041 (patch) | |
| tree | 1eb19e4d14cfc4f80b1000fab6f42c8cac42e2c0 | |
| parent | 4c9e665cb1132b92812886d08ec784132eb66caf (diff) | |
| download | linux-84df3cde16090d5d1de4df31623ef0433fdea041.tar.xz | |
smb: smbdirect: split out smbdirect_accept_negotiate_finish()
This will make it easier to support the listen/accept socket interfaces
in the next steps.
Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Long Li <longli@microsoft.com>
Cc: Namjae Jeon <linkinjeon@kernel.org>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
| -rw-r--r-- | fs/smb/common/smbdirect/smbdirect_accept.c | 26 | ||||
| -rw-r--r-- | fs/smb/common/smbdirect/smbdirect_internal.h | 2 |
2 files changed, 21 insertions, 7 deletions
diff --git a/fs/smb/common/smbdirect/smbdirect_accept.c b/fs/smb/common/smbdirect/smbdirect_accept.c index 4baa2c1ad31e..72ee80a185f6 100644 --- a/fs/smb/common/smbdirect/smbdirect_accept.c +++ b/fs/smb/common/smbdirect/smbdirect_accept.c @@ -301,12 +301,7 @@ static void smbdirect_accept_negotiate_recv_work(struct work_struct *work) u32 preferred_send_size; u32 max_receive_size; u32 max_fragmented_size; - struct smbdirect_send_io *send_io = NULL; - struct smbdirect_negotiate_resp *nrep; u32 ntstatus; - int posted; - u16 new_credits; - int ret; if (sc->first_error) return; @@ -459,6 +454,25 @@ static void smbdirect_accept_negotiate_recv_work(struct work_struct *work) */ sp->max_fragmented_send_size = max_fragmented_size; + ntstatus = le32_to_cpu(STATUS_SUCCESS); + +not_supported: + smbdirect_accept_negotiate_finish(sc, ntstatus); +} + +void smbdirect_accept_negotiate_finish(struct smbdirect_socket *sc, u32 ntstatus) +{ + const struct smbdirect_socket_parameters *sp = &sc->parameters; + struct smbdirect_recv_io *recv_io; + struct smbdirect_send_io *send_io; + struct smbdirect_negotiate_resp *nrep; + int posted; + u16 new_credits; + int ret; + + if (ntstatus) + goto not_supported; + /* * Prepare for receiving data_transfer messages */ @@ -486,8 +500,6 @@ static void smbdirect_accept_negotiate_recv_work(struct work_struct *work) */ new_credits = smbdirect_connection_grant_recv_credits(sc); - ntstatus = le32_to_cpu(STATUS_SUCCESS); - not_supported: send_io = smbdirect_connection_alloc_send_io(sc); if (IS_ERR(send_io)) { diff --git a/fs/smb/common/smbdirect/smbdirect_internal.h b/fs/smb/common/smbdirect/smbdirect_internal.h index ae6044ddeb59..f8432c8c1a5f 100644 --- a/fs/smb/common/smbdirect/smbdirect_internal.h +++ b/fs/smb/common/smbdirect/smbdirect_internal.h @@ -132,4 +132,6 @@ int smbdirect_connection_create_mr_list(struct smbdirect_socket *sc); __SMBDIRECT_PRIVATE__ void smbdirect_connection_destroy_mr_list(struct smbdirect_socket *sc); +void smbdirect_accept_negotiate_finish(struct smbdirect_socket *sc, u32 ntstatus); + #endif /* __FS_SMB_COMMON_SMBDIRECT_INTERNAL_H__ */ |