[PATCH] dlm_controld: Support for extended value of kernel

[PATCH] dlm_controld: Support for extended value of kernel

[Heming Zhao]

This patch should work with the updated kernel dlm module, because
the code changes need to be aligned with the DLM_MAX_ADDR_COUNT value.

Another notice is that with the current dlm_controld code, users
should explicitly add 'protocol=sctp' to the dlm.conf in a corosync
3.x env.

Signed-off-by: Heming Zhao <heming.zhao@suse.com>
---
 dlm_controld/dlm_daemon.h | 6 +++---
 dlm_sand/sand_internal.h  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h
index 4a533e3451e2..c902228f890f 100644
--- a/dlm_controld/dlm_daemon.h
+++ b/dlm_controld/dlm_daemon.h
@@ -175,10 +175,10 @@ EXTERN struct dlm_option dlm_options[dlm_options_max];
 
 #define MAX_NODES	128
 
-/* Maximum number of IP addresses per node, when using SCTP and multi-ring in
-   corosync  In dlm-kernel this is DLM_MAX_ADDR_COUNT, currently 3. */
+/* Maximum number of IP addresses per node, when using SCTP and multi-[ring|link]
+   in corosync [2|3]. In dlm-kernel this is DLM_MAX_ADDR_COUNT, currently 8. */
 
-#define MAX_NODE_ADDRESSES 4
+#define MAX_NODE_ADDRESSES 8
 
 #define PROTO_TCP  0
 #define PROTO_SCTP 1
diff --git a/dlm_sand/sand_internal.h b/dlm_sand/sand_internal.h
index 4c2fc0897051..c17287abcd47 100644
--- a/dlm_sand/sand_internal.h
+++ b/dlm_sand/sand_internal.h
@@ -138,9 +138,9 @@ EXTERN struct dlm_option dlm_options[dlm_options_max];
    Copied in libdlm.h so apps don't need to include the kernel header. */
 
 /* Maximum number of IP addresses per node, when using SCTP.
-   In dlm-kernel this is DLM_MAX_ADDR_COUNT, currently 3. */
+   In dlm-kernel this is DLM_MAX_ADDR_COUNT, currently 8. */
 
-#define MAX_NODE_ADDRESSES 4
+#define MAX_NODE_ADDRESSES 8
 
 #define PROTO_TCP  0
 #define PROTO_SCTP 1
-- 
2.48.1

Re: [PATCH] dlm_controld: Support for extended value of kernel

[Heming Zhao]

Sorry, please ignore this mail and check next mail.
This mail's patch subject too long and has been wrapped by editor.

On 2/21/25 23:06, Heming Zhao wrote:
> This patch should work with the updated kernel dlm module, because
> the code changes need to be aligned with the DLM_MAX_ADDR_COUNT value.
> 
> Another notice is that with the current dlm_controld code, users
> should explicitly add 'protocol=sctp' to the dlm.conf in a corosync
> 3.x env.
> 
> Signed-off-by: Heming Zhao <heming.zhao@suse.com>
> ---
>   dlm_controld/dlm_daemon.h | 6 +++---
>   dlm_sand/sand_internal.h  | 4 ++--
>   2 files changed, 5 insertions(+), 5 deletions(-)
>