Skip to content

Commit cc678b8

Browse files
metze-sambasmfrench
authored andcommitted
smb: client/smbdirect: introduce SMBDIRECT_SOCKET_ERROR
This will be used to turn SMBDIRECT_SOCKET_CONNECTED into an error within smbd_disconnect_rdma_connection() on the client and smb_direct_disconnect_rdma_connection() on the server. We do this in a single commit with the client as otherwise it won't build because the enum value is not handled in the switch statement. Cc: Steve French <[email protected]> Cc: Tom Talpey <[email protected]> Cc: Long Li <[email protected]> Acked-by: Namjae Jeon <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Stefan Metzmacher <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 58dfba8 commit cc678b8

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

fs/smb/client/smbdirect.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ static void smbd_disconnect_rdma_work(struct work_struct *work)
166166
case SMBDIRECT_SOCKET_NEGOTIATE_RUNNING:
167167
case SMBDIRECT_SOCKET_NEGOTIATE_FAILED:
168168
case SMBDIRECT_SOCKET_CONNECTED:
169+
case SMBDIRECT_SOCKET_ERROR:
169170
sc->status = SMBDIRECT_SOCKET_DISCONNECTING;
170171
rdma_disconnect(sc->rdma.cm_id);
171172
break;

fs/smb/common/smbdirect/smbdirect_socket.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ enum smbdirect_socket_status {
2323
SMBDIRECT_SOCKET_NEGOTIATE_RUNNING,
2424
SMBDIRECT_SOCKET_NEGOTIATE_FAILED,
2525
SMBDIRECT_SOCKET_CONNECTED,
26+
SMBDIRECT_SOCKET_ERROR,
2627
SMBDIRECT_SOCKET_DISCONNECTING,
2728
SMBDIRECT_SOCKET_DISCONNECTED,
2829
SMBDIRECT_SOCKET_DESTROYED
@@ -60,6 +61,8 @@ const char *smbdirect_socket_status_string(enum smbdirect_socket_status status)
6061
return "NEGOTIATE_FAILED";
6162
case SMBDIRECT_SOCKET_CONNECTED:
6263
return "CONNECTED";
64+
case SMBDIRECT_SOCKET_ERROR:
65+
return "ERROR";
6366
case SMBDIRECT_SOCKET_DISCONNECTING:
6467
return "DISCONNECTING";
6568
case SMBDIRECT_SOCKET_DISCONNECTED:

0 commit comments

Comments
 (0)