This reverts commit 7a273b8714da400d292d6c9762acedcde1997e52.
The "bind_all" per comms configfs never came upstream.
---
dlm_controld/action.c | 19 -------------------
dlm_controld/dlm.conf.5 | 2 --
dlm_controld/dlm_daemon.h | 1 -
dlm_controld/main.c | 5 -----
4 files changed, 27 deletions(-)
diff --git a/dlm_controld/action.c b/dlm_controld/action.c
index 67aa6896..60eb22a7 100644
--- a/dlm_controld/action.c
+++ b/dlm_controld/action.c
@@ -692,25 +692,6 @@ skip_non_required:
return -1;
}
close(fd);
-
- if (opt(bind_all_ind)) {
- memset(path, 0, PATH_MAX);
- snprintf(path, PATH_MAX, "%s/%d/bind_all", COMMS_DIR, nodeid);
-
- fd = open(path, O_WRONLY);
- if (fd < 0) {
- log_error("%s: open failed: %d", path, errno);
- return -1;
- }
-
- rv = do_write(fd, (void *)"1", strlen("1"));
- if (rv < 0) {
- log_error("%s: write failed: %d", path, errno);
- close(fd);
- return -1;
- }
- close(fd);
- }
out:
return 0;
}
diff --git a/dlm_controld/dlm.conf.5 b/dlm_controld/dlm.conf.5
index 164b5b70..cb13eaf0 100644
--- a/dlm_controld/dlm.conf.5
+++ b/dlm_controld/dlm.conf.5
@@ -40,8 +40,6 @@ log_debug(*)
.br
protocol
.br
-bind_all
-.br
mark
.br
debug_logfile(*)
diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h
index 86b37603..4a533e34 100644
--- a/dlm_controld/dlm_daemon.h
+++ b/dlm_controld/dlm_daemon.h
@@ -105,7 +105,6 @@ enum {
protocol_ind,
port_ind,
debug_logfile_ind,
- bind_all_ind,
mark_ind,
enable_fscontrol_ind,
enable_plock_ind,
diff --git a/dlm_controld/main.c b/dlm_controld/main.c
index 14be5edd..24f0b3f8 100644
--- a/dlm_controld/main.c
+++ b/dlm_controld/main.c
@@ -1823,11 +1823,6 @@ static void set_opt_defaults(void)
-1, NULL, 21064, 0,
"dlm kernel lowcomms protocol port");
- set_opt_default(bind_all_ind,
- "bind_all", '\0', req_arg_int,
- 0, NULL, 0, 0,
- ""); /* do not advertise */
-
set_opt_default(mark_ind,
"mark", '\0', req_arg_uint,
0, NULL, 0, 0,
--
2.31.1
