|
@@ -1498,8 +1498,8 @@ int smbd_reconnect(struct TCP_Server_Info *server)
|
|
|
log_rdma_event(INFO, "reconnecting rdma session\n");
|
|
|
|
|
|
if (!server->smbd_conn) {
|
|
|
- log_rdma_event(ERR, "rdma session already destroyed\n");
|
|
|
- return -EINVAL;
|
|
|
+ log_rdma_event(INFO, "rdma session already destroyed\n");
|
|
|
+ goto create_conn;
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -1512,15 +1512,19 @@ int smbd_reconnect(struct TCP_Server_Info *server)
|
|
|
}
|
|
|
|
|
|
/* wait until the transport is destroyed */
|
|
|
- wait_event(server->smbd_conn->wait_destroy,
|
|
|
- server->smbd_conn->transport_status == SMBD_DESTROYED);
|
|
|
+ if (!wait_event_timeout(server->smbd_conn->wait_destroy,
|
|
|
+ server->smbd_conn->transport_status == SMBD_DESTROYED, 5*HZ))
|
|
|
+ return -EAGAIN;
|
|
|
|
|
|
destroy_workqueue(server->smbd_conn->workqueue);
|
|
|
kfree(server->smbd_conn);
|
|
|
|
|
|
+create_conn:
|
|
|
log_rdma_event(INFO, "creating rdma session\n");
|
|
|
server->smbd_conn = smbd_get_connection(
|
|
|
server, (struct sockaddr *) &server->dstaddr);
|
|
|
+ log_rdma_event(INFO, "created rdma session info=%p\n",
|
|
|
+ server->smbd_conn);
|
|
|
|
|
|
return server->smbd_conn ? 0 : -ENOENT;
|
|
|
}
|