Skip to content

Commit

Permalink
CIFS: SMBD: Implement function to destroy a SMB Direct connection
Browse files Browse the repository at this point in the history
Add function to tear down a SMB Direct connection. This is used by upper layer
to free all SMB Direct connection and transport resources.

Signed-off-by: Long Li <longli@microsoft.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
  • Loading branch information
longlimsft authored and smfrench committed Jan 25, 2018
1 parent 781a805 commit 8ef130f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
16 changes: 16 additions & 0 deletions fs/cifs/smbdirect.c
Original file line number Diff line number Diff line change
Expand Up @@ -1387,6 +1387,22 @@ static void idle_connection_timer(struct work_struct *work)
info->keep_alive_interval*HZ);
}

/* Destroy this SMBD connection, called from upper layer */
void smbd_destroy(struct smbd_connection *info)
{
log_rdma_event(INFO, "destroying rdma session\n");

/* Kick off the disconnection process */
smbd_disconnect_rdma_connection(info);

log_rdma_event(INFO, "wait for transport being destroyed\n");
wait_event(info->wait_destroy,
info->transport_status == SMBD_DESTROYED);

destroy_workqueue(info->workqueue);
kfree(info);
}

/*
* Reconnect this SMBD connection, called from upper layer
* return value: 0 on success, or actual error code
Expand Down
3 changes: 3 additions & 0 deletions fs/cifs/smbdirect.h
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,16 @@ struct smbd_connection *smbd_get_connection(

/* Reconnect SMBDirect session */
int smbd_reconnect(struct TCP_Server_Info *server);
/* Destroy SMBDirect session */
void smbd_destroy(struct smbd_connection *info);

#else
#define cifs_rdma_enabled(server) 0
struct smbd_connection {};
static inline void *smbd_get_connection(
struct TCP_Server_Info *server, struct sockaddr *dstaddr) {return NULL;}
static inline int smbd_reconnect(struct TCP_Server_Info *server) {return -1; }
static inline void smbd_destroy(struct smbd_connection *info) {}
#endif

#endif

0 comments on commit 8ef130f

Please sign in to comment.