[Cluster-devel] [PATCH dlm-tool 1/2] Revert "dlm_controld: add support for waitplock_recovery switch"

[Alexander Aring <aahringo@redhat.com>]

This reverts commit 0e9d0a6563f4acef5a27eade8eb29c7e6748c8d2.
---
 dlm_controld/action.c     | 5 -----
 dlm_controld/dlm.conf.5   | 2 --
 dlm_controld/dlm_daemon.h | 1 -
 dlm_controld/main.c       | 5 -----
 4 files changed, 13 deletions(-)

diff --git a/dlm_controld/action.c b/dlm_controld/action.c
index bc9c44f2..9e18d286 100644
--- a/dlm_controld/action.c
+++ b/dlm_controld/action.c
@@ -881,11 +881,6 @@ int setup_configfs_options(void)
 	    dlm_options[timewarn_ind].file_set)
 		set_configfs_cluster("timewarn_cs", NULL, opt(timewarn_ind));
 
-	if (dlm_options[enable_waitplock_recovery_ind].cli_set ||
-	    dlm_options[enable_waitplock_recovery_ind].file_set)
-		set_configfs_cluster("waitplock_recovery", NULL,
-				     opt(enable_waitplock_recovery_ind));
-
 	set_configfs_cluster("mark", NULL, optu(mark_ind));
 
 	proto_name = opts(protocol_ind);
diff --git a/dlm_controld/dlm.conf.5 b/dlm_controld/dlm.conf.5
index e92dfc8e..1ce0c644 100644
--- a/dlm_controld/dlm.conf.5
+++ b/dlm_controld/dlm.conf.5
@@ -46,8 +46,6 @@ debug_logfile
 .br
 enable_plock
 .br
-enable_waitplock_recovery
-.br
 plock_debug
 .br
 plock_rate_limit
diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h
index ee21c256..0b4ae5f2 100644
--- a/dlm_controld/dlm_daemon.h
+++ b/dlm_controld/dlm_daemon.h
@@ -102,7 +102,6 @@ enum {
         mark_ind,
         enable_fscontrol_ind,
         enable_plock_ind,
-        enable_waitplock_recovery_ind,
         plock_debug_ind,
         plock_rate_limit_ind,
         plock_ownership_ind,
diff --git a/dlm_controld/main.c b/dlm_controld/main.c
index 645bd26b..470a067c 100644
--- a/dlm_controld/main.c
+++ b/dlm_controld/main.c
@@ -1768,11 +1768,6 @@ static void set_opt_defaults(void)
 			1, NULL, 0,
 			"enable/disable posix lock support for cluster fs");
 
-	set_opt_default(enable_waitplock_recovery_ind,
-			"enable_waitplock_recovery", '\0', req_arg_bool,
-			0, NULL, 0,
-			"enable/disable posix lock to wait for dlm recovery after lock acquire");
-
 	set_opt_default(plock_debug_ind,
 			"plock_debug", 'P', no_arg,
 			0, NULL, 0,
-- 
2.26.2