summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2025-10-17 15:53:04 +0200
committerSteve French <stfrench@microsoft.com>2026-04-15 21:58:23 -0500
commit1421d50ea941c450d089d3b296d308f2b2728f6d (patch)
tree2537f361b2c5e377154850f50e7a6c7008ddd52b
parent0a1702e9319f428e2e24a6f4b7109d212296f812 (diff)
downloadlwn-1421d50ea941c450d089d3b296d308f2b2728f6d.tar.gz
lwn-1421d50ea941c450d089d3b296d308f2b2728f6d.zip
smb: server: make use of smbdirect_connection_request_keep_alive()
This will help to share more common code soon. Cc: Namjae Jeon <linkinjeon@kernel.org> Cc: Steve French <smfrench@gmail.com> Cc: Tom Talpey <tom@talpey.com> 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/server/transport_rdma.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/fs/smb/server/transport_rdma.c b/fs/smb/server/transport_rdma.c
index 278dca912485..c3d4ce423db3 100644
--- a/fs/smb/server/transport_rdma.c
+++ b/fs/smb/server/transport_rdma.c
@@ -618,23 +618,6 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,
return ret;
}
-static int manage_keep_alive_before_sending(struct smbdirect_socket *sc)
-{
- struct smbdirect_socket_parameters *sp = &sc->parameters;
-
- if (sc->idle.keepalive == SMBDIRECT_KEEPALIVE_PENDING) {
- sc->idle.keepalive = SMBDIRECT_KEEPALIVE_SENT;
- /*
- * Now use the keepalive timeout (instead of keepalive interval)
- * in order to wait for a response
- */
- mod_delayed_work(sc->workqueue, &sc->idle.timer_work,
- msecs_to_jiffies(sp->keepalive_timeout_msec));
- return 1;
- }
- return 0;
-}
-
static int smb_direct_post_send(struct smbdirect_socket *sc,
struct ib_send_wr *wr)
{
@@ -802,7 +785,7 @@ static int smb_direct_create_header(struct smbdirect_socket *sc,
packet->credits_granted = cpu_to_le16(new_credits);
packet->flags = 0;
- if (manage_keep_alive_before_sending(sc))
+ if (smbdirect_connection_request_keep_alive(sc))
packet->flags |= cpu_to_le16(SMBDIRECT_FLAG_RESPONSE_REQUESTED);
packet->reserved = 0;