p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fs: dlm: auto load sctp module 

This patch adds a "for now" better handling of missing SCTP support in
the kernel and try to load the sctp module if SCTP is set.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
Alexander Aring 2021-07-16 16:22:42 -04:00 committed by David Teigland
parent 2dc6b1158c
commit 90d21fc047
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/dlm/lowcomms.c
View File

@ -1864,11 +1864,9 @@ static int dlm_listen_for_all(void)
log_print("Using %s for communications", log_print("Using %s for communications",
dlm_proto_ops->name); dlm_proto_ops->name);
if (dlm_proto_ops->listen_validate) { result = dlm_proto_ops->listen_validate();
result = dlm_proto_ops->listen_validate(); if (result < 0)
if (result < 0) return result;
return result;
}
result = sock_create_kern(&init_net, dlm_local_addr[0]->ss_family, result = sock_create_kern(&init_net, dlm_local_addr[0]->ss_family,
SOCK_STREAM, dlm_proto_ops->proto, &sock); SOCK_STREAM, dlm_proto_ops->proto, &sock);
@ -1945,6 +1943,17 @@ static const struct dlm_proto_ops dlm_tcp_ops = {
.eof_condition = tcp_eof_condition, .eof_condition = tcp_eof_condition,
}; };
static int dlm_sctp_listen_validate(void)
{
if (!IS_ENABLED(CONFIG_IP_SCTP)) {
log_print("SCTP is not enabled by this kernel");
return -EOPNOTSUPP;
}
request_module("sctp");
return 0;
}
static int dlm_sctp_bind_listen(struct socket *sock) static int dlm_sctp_bind_listen(struct socket *sock)
{ {
return sctp_bind_addrs(sock, dlm_config.ci_tcp_port); return sctp_bind_addrs(sock, dlm_config.ci_tcp_port);
@ -1960,6 +1969,7 @@ static void dlm_sctp_sockopts(struct socket *sock)
static const struct dlm_proto_ops dlm_sctp_ops = { static const struct dlm_proto_ops dlm_sctp_ops = {
.name = "SCTP", .name = "SCTP",
.proto = IPPROTO_SCTP, .proto = IPPROTO_SCTP,
.listen_validate = dlm_sctp_listen_validate,
.listen_sockopts = dlm_sctp_sockopts, .listen_sockopts = dlm_sctp_sockopts,
.listen_bind = dlm_sctp_bind_listen, .listen_bind = dlm_sctp_bind_listen,
.connect_action = sctp_connect_to_sock, .connect_action = sctp_connect_to_sock,