smb: client: make use of smbdirect_connection_request_keep_alive()

This will help to share more common code soon.

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>

diff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c
index 4cc5dc825ee4fe0eaeb3258d16ca92d932c7debd..2464e0617eec39f7e5c944dfe971d90912b9c766 100644 (file)
--- a/fs/smb/client/smbdirect.c
+++ b/fs/smb/client/smbdirect.c
@@ -759,32 +759,6 @@ dma_mapping_failed:
        return rc;
 }
 
-/*
- * Check if we need to send a KEEP_ALIVE message
- * The idle connection timer triggers a KEEP_ALIVE message when expires
- * SMBDIRECT_FLAG_RESPONSE_REQUESTED is set in the message flag to have peer send
- * back a response.
- * return value:
- * 1 if SMBDIRECT_FLAG_RESPONSE_REQUESTED needs to be set
- * 0: otherwise
- */
-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 smbd_ib_post_send(struct smbdirect_socket *sc,
                             struct ib_send_wr *wr)
 {
@@ -1108,7 +1082,7 @@ static int smbd_post_send_iter(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;