Skip to content

Commit 663b3c3

Browse files
metze-sambasmfrench
authored andcommitted
smb: server: pass struct smbdirect_socket to manage_credits_prior_sending()
This will make it easier to move function to the common code in future. 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>
1 parent b156d2c commit 663b3c3

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

fs/smb/server/transport_rdma.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -852,9 +852,8 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc)
852852
smb_direct_free_sendmsg(sc, sibling);
853853
}
854854

855-
static int manage_credits_prior_sending(struct smb_direct_transport *t)
855+
static int manage_credits_prior_sending(struct smbdirect_socket *sc)
856856
{
857-
struct smbdirect_socket *sc = &t->socket;
858857
int new_credits;
859858

860859
if (atomic_read(&sc->recv_io.credits.count) >= sc->recv_io.credits.target)
@@ -1026,7 +1025,7 @@ static int smb_direct_create_header(struct smb_direct_transport *t,
10261025
/* Fill in the packet header */
10271026
packet = (struct smbdirect_data_transfer *)sendmsg->packet;
10281027
packet->credits_requested = cpu_to_le16(sp->send_credit_target);
1029-
packet->credits_granted = cpu_to_le16(manage_credits_prior_sending(t));
1028+
packet->credits_granted = cpu_to_le16(manage_credits_prior_sending(sc));
10301029

10311030
packet->flags = 0;
10321031
if (manage_keep_alive_before_sending(t))
@@ -1667,7 +1666,7 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t,
16671666
resp->reserved = 0;
16681667
resp->credits_requested =
16691668
cpu_to_le16(sp->send_credit_target);
1670-
resp->credits_granted = cpu_to_le16(manage_credits_prior_sending(t));
1669+
resp->credits_granted = cpu_to_le16(manage_credits_prior_sending(sc));
16711670
resp->max_readwrite_size = cpu_to_le32(sp->max_read_write_size);
16721671
resp->preferred_send_size = cpu_to_le32(sp->max_send_size);
16731672
resp->max_receive_size = cpu_to_le32(sp->max_recv_size);

0 commit comments

Comments
 (0)