Skip to content

Commit c0cb982

Browse files
metze-sambasmfrench
authored andcommitted
smb: server: pass struct smbdirect_socket to smb_direct_post_send_data()
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 ab83128 commit c0cb982

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

fs/smb/server/transport_rdma.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static inline int get_buf_page_count(void *buf, int size)
135135

136136
static void smb_direct_destroy_pools(struct smbdirect_socket *sc);
137137
static void smb_direct_post_recv_credits(struct work_struct *work);
138-
static int smb_direct_post_send_data(struct smb_direct_transport *t,
138+
static int smb_direct_post_send_data(struct smbdirect_socket *sc,
139139
struct smbdirect_send_batch *send_ctx,
140140
struct kvec *iov, int niov,
141141
int remaining_data_length);
@@ -270,13 +270,11 @@ static void smb_direct_send_immediate_work(struct work_struct *work)
270270
{
271271
struct smbdirect_socket *sc =
272272
container_of(work, struct smbdirect_socket, idle.immediate_work);
273-
struct smb_direct_transport *t =
274-
container_of(sc, struct smb_direct_transport, socket);
275273

276274
if (sc->status != SMBDIRECT_SOCKET_CONNECTED)
277275
return;
278276

279-
smb_direct_post_send_data(t, NULL, NULL, 0, 0);
277+
smb_direct_post_send_data(sc, NULL, NULL, 0, 0);
280278
}
281279

282280
static void smb_direct_idle_connection_timer(struct work_struct *work)
@@ -1153,12 +1151,11 @@ static int post_sendmsg(struct smbdirect_socket *sc,
11531151
return smb_direct_post_send(sc, &msg->wr);
11541152
}
11551153

1156-
static int smb_direct_post_send_data(struct smb_direct_transport *t,
1154+
static int smb_direct_post_send_data(struct smbdirect_socket *sc,
11571155
struct smbdirect_send_batch *send_ctx,
11581156
struct kvec *iov, int niov,
11591157
int remaining_data_length)
11601158
{
1161-
struct smbdirect_socket *sc = &t->socket;
11621159
int i, j, ret;
11631160
struct smbdirect_send_io *msg;
11641161
int data_length;
@@ -1337,7 +1334,7 @@ static int smb_direct_writev(struct ksmbd_transport *t,
13371334

13381335
remaining_data_length -= bytes;
13391336

1340-
ret = smb_direct_post_send_data(st, &send_ctx,
1337+
ret = smb_direct_post_send_data(sc, &send_ctx,
13411338
vecs, nvecs,
13421339
remaining_data_length);
13431340
if (unlikely(ret)) {

0 commit comments

Comments
 (0)