Skip to content

Commit 73dc52d

Browse files
metze-sambasmfrench
authored andcommitted
smb: client: no longer use smbdirect_socket_set_custom_workqueue()
smbdirect.ko has global workqueues now, so we should use these default once. 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>
1 parent 1adde16 commit 73dc52d

2 files changed

Lines changed: 0 additions & 13 deletions

File tree

fs/smb/client/smbdirect.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ void smbd_destroy(struct TCP_Server_Info *server)
211211

212212
smbdirect_socket_release(info->socket);
213213

214-
destroy_workqueue(info->workqueue);
215214
kfree(info);
216215
server->smbd_conn = NULL;
217216
}
@@ -261,7 +260,6 @@ static struct smbd_connection *_smbd_get_connection(
261260
struct smbdirect_socket_parameters *sp;
262261
__be16 *sport;
263262
u64 port_flags = 0;
264-
char wq_name[80];
265263
int ret;
266264

267265
switch (port) {
@@ -306,10 +304,6 @@ static struct smbd_connection *_smbd_get_connection(
306304
info = kzalloc_obj(*info);
307305
if (!info)
308306
return NULL;
309-
scnprintf(wq_name, ARRAY_SIZE(wq_name), "smbd_%p", info);
310-
info->workqueue = create_workqueue(wq_name);
311-
if (!info->workqueue)
312-
goto create_wq_failed;
313307
ret = smbdirect_socket_create_kern(net, &sc);
314308
if (ret)
315309
goto socket_init_failed;
@@ -320,9 +314,6 @@ static struct smbd_connection *_smbd_get_connection(
320314
ret = smbdirect_socket_set_kernel_settings(sc, IB_POLL_SOFTIRQ, GFP_KERNEL);
321315
if (ret)
322316
goto set_settings_failed;
323-
ret = smbdirect_socket_set_custom_workqueue(sc, info->workqueue);
324-
if (ret)
325-
goto set_workqueue_failed;
326317

327318
if (dstaddr->sa_family == AF_INET6)
328319
sport = &((struct sockaddr_in6 *)dstaddr)->sin6_port;
@@ -342,13 +333,10 @@ static struct smbd_connection *_smbd_get_connection(
342333
return info;
343334

344335
connect_failed:
345-
set_workqueue_failed:
346336
set_settings_failed:
347337
set_params_failed:
348338
smbdirect_socket_release(sc);
349339
socket_init_failed:
350-
destroy_workqueue(info->workqueue);
351-
create_wq_failed:
352340
kfree(info);
353341
return NULL;
354342
}

fs/smb/client/smbdirect.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ extern int smbd_receive_credit_max;
2525

2626
struct smbd_connection {
2727
struct smbdirect_socket *socket;
28-
struct workqueue_struct *workqueue;
2928
};
3029

3130
/* Create a SMBDirect session */

0 commit comments

Comments
 (0)