Skip to content

Commit 895ad6f

Browse files
metze-sambasmfrench
authored andcommitted
smb: client: call smbd_destroy() in the same splace as kernel_sock_shutdown()/sock_release()
With commit b043220 ("smb: client: let destroy_mr_list() keep smbdirect_mr_io memory if registered") the changes from commit 214bab4 ("cifs: Call MID callback before destroying transport") and commit 1d2a4f5 ("cifs:smbd When reconnecting to server, call smbd_destroy() after all MIDs have been called") are no longer needed. And it's better to use the same logic flow, so that the chance of smbdirect related problems is smaller. Fixes: 214bab4 ("cifs: Call MID callback before destroying transport") Fixes: 1d2a4f5 ("cifs:smbd When reconnecting to server, call smbd_destroy() after all MIDs have been called") 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> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent fac56c4 commit 895ad6f

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

fs/smb/client/connect.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,8 @@ cifs_abort_connection(struct TCP_Server_Info *server)
310310
server->ssocket->flags);
311311
sock_release(server->ssocket);
312312
server->ssocket = NULL;
313+
} else if (cifs_rdma_enabled(server)) {
314+
smbd_destroy(server);
313315
}
314316
server->sequence_number = 0;
315317
server->session_estab = false;
@@ -338,12 +340,6 @@ cifs_abort_connection(struct TCP_Server_Info *server)
338340
mid_execute_callback(mid);
339341
release_mid(mid);
340342
}
341-
342-
if (cifs_rdma_enabled(server)) {
343-
cifs_server_lock(server);
344-
smbd_destroy(server);
345-
cifs_server_unlock(server);
346-
}
347343
}
348344

349345
static bool cifs_tcp_ses_needs_reconnect(struct TCP_Server_Info *server, int num_targets)

0 commit comments

Comments
 (0)