tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Stefan Metzmacher and committed by
Steve French 73dc52d2 1adde16a

-13
-12
fs/smb/client/smbdirect.c
··· 211 211 212 212 smbdirect_socket_release(info->socket); 213 213 214 - destroy_workqueue(info->workqueue); 215 214 kfree(info); 216 215 server->smbd_conn = NULL; 217 216 } ··· 260 261 struct smbdirect_socket_parameters *sp; 261 262 __be16 *sport; 262 263 u64 port_flags = 0; 263 - char wq_name[80]; 264 264 int ret; 265 265 266 266 switch (port) { ··· 304 306 info = kzalloc_obj(*info); 305 307 if (!info) 306 308 return NULL; 307 - scnprintf(wq_name, ARRAY_SIZE(wq_name), "smbd_%p", info); 308 - info->workqueue = create_workqueue(wq_name); 309 - if (!info->workqueue) 310 - goto create_wq_failed; 311 309 ret = smbdirect_socket_create_kern(net, &sc); 312 310 if (ret) 313 311 goto socket_init_failed; ··· 314 320 ret = smbdirect_socket_set_kernel_settings(sc, IB_POLL_SOFTIRQ, GFP_KERNEL); 315 321 if (ret) 316 322 goto set_settings_failed; 317 - ret = smbdirect_socket_set_custom_workqueue(sc, info->workqueue); 318 - if (ret) 319 - goto set_workqueue_failed; 320 323 321 324 if (dstaddr->sa_family == AF_INET6) 322 325 sport = &((struct sockaddr_in6 *)dstaddr)->sin6_port; ··· 333 342 return info; 334 343 335 344 connect_failed: 336 - set_workqueue_failed: 337 345 set_settings_failed: 338 346 set_params_failed: 339 347 smbdirect_socket_release(sc); 340 348 socket_init_failed: 341 - destroy_workqueue(info->workqueue); 342 - create_wq_failed: 343 349 kfree(info); 344 350 return NULL; 345 351 }
-1
fs/smb/client/smbdirect.h
··· 25 25 26 26 struct smbd_connection { 27 27 struct smbdirect_socket *socket; 28 - struct workqueue_struct *workqueue; 29 28 }; 30 29 31 30 /* Create a SMBDirect session */