Skip to content

Commit b3fd52a

Browse files
metze-sambasmfrench
authored andcommitted
smb: server: let smb_direct_disconnect_rdma_connection() set SMBDIRECT_SOCKET_ERROR...
smb_direct_disconnect_rdma_connection() should turn the status into an error state instead of leaving it as is until smb_direct_disconnect_rdma_work() is running. Cc: Steve French <smfrench@gmail.com> Cc: Tom Talpey <tom@talpey.com> Cc: Long Li <longli@microsoft.com> Acked-by: 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 9d00508 commit b3fd52a

1 file changed

Lines changed: 40 additions & 0 deletions

File tree

fs/smb/server/transport_rdma.c

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,46 @@ static void smb_direct_disconnect_rdma_work(struct work_struct *work)
259259
static void
260260
smb_direct_disconnect_rdma_connection(struct smbdirect_socket *sc)
261261
{
262+
switch (sc->status) {
263+
case SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED:
264+
case SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED:
265+
case SMBDIRECT_SOCKET_RDMA_CONNECT_FAILED:
266+
case SMBDIRECT_SOCKET_NEGOTIATE_FAILED:
267+
case SMBDIRECT_SOCKET_ERROR:
268+
case SMBDIRECT_SOCKET_DISCONNECTING:
269+
case SMBDIRECT_SOCKET_DISCONNECTED:
270+
case SMBDIRECT_SOCKET_DESTROYED:
271+
/*
272+
* Keep the current error status
273+
*/
274+
break;
275+
276+
case SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED:
277+
case SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING:
278+
sc->status = SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED;
279+
break;
280+
281+
case SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED:
282+
case SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING:
283+
sc->status = SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED;
284+
break;
285+
286+
case SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED:
287+
case SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING:
288+
sc->status = SMBDIRECT_SOCKET_RDMA_CONNECT_FAILED;
289+
break;
290+
291+
case SMBDIRECT_SOCKET_NEGOTIATE_NEEDED:
292+
case SMBDIRECT_SOCKET_NEGOTIATE_RUNNING:
293+
sc->status = SMBDIRECT_SOCKET_NEGOTIATE_FAILED;
294+
break;
295+
296+
case SMBDIRECT_SOCKET_CREATED:
297+
case SMBDIRECT_SOCKET_CONNECTED:
298+
sc->status = SMBDIRECT_SOCKET_ERROR;
299+
break;
300+
}
301+
262302
queue_work(sc->workqueue, &sc->disconnect_work);
263303
}
264304

0 commit comments

Comments
 (0)