Skip to contentSkip to conversation

dlm_controld: changes from v2 to v3

PATCH New Alexander Aring 1 participant 4 messages Jul 9, 2020

lore
Share & tools
lore
#0 lore raw

cover dlm_controld: changes from v2 to v3

Hi,

series v2 got applied and my changes for series v3 got dropped. I created this patch series now to sync upstream with the previous v3 series. Every change is now splitted in a separate patch.

Thank you.

- Alex

Alexander Aring (3):
dlm_controld: don't abort node configuration
dlm_controld: change enable_waitplock_recovery default
dlm_controld: add default value handling for unsigned int

 dlm_controld/action.c     |  7 ++++-
 dlm_controld/dlm_daemon.h |  1 +
 dlm_controld/main.c       | 61 +++++++++++++++++++++------------------
 3 files changed, 40 insertions(+), 29 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/3 dlm_controld: don't abort node configuration

In case of not having mark value file we don't abort the whole configuration if any error on open fails. We skip this specific setting and jump to the next one since it's not mandatory to have a correct mark setting. It will still appear inside the logs.

---
 dlm_controld/action.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
dlm_controld/action.c +6 -1
index 63040227..bc9c44f2 100644
@@ -642,6 +642,9 @@ int add_configfs_node(int nodeid, char *addr, int addrlen, int local,
 
 	/*
 	 * set skb mark for nodeid
+	 *
+	 * If open() fails we skip it because kernel doesn't support it.
+	 * It's not a required confiuration. It will show up in the log.
 	 */
 
 	memset(path, 0, PATH_MAX);
@@ -650,7 +653,7 @@ int add_configfs_node(int nodeid, char *addr, int addrlen, int local,
 	fd = open(path, O_WRONLY);
 	if (fd < 0) {
 		log_error("%s: open failed: %d", path, errno);
-		return -1;
+		goto skip_non_required;
 	}
 
 	memset(buf, 0, sizeof(buf));
@@ -664,6 +667,8 @@ int add_configfs_node(int nodeid, char *addr, int addrlen, int local,
 	}
 	close(fd);
 
+skip_non_required:
+
 	/*
 	 * set local
 	 */
Signature · 1 line
2.26.2
#2 lore raw

PATCH 2/3 dlm_controld: change enable_waitplock_recovery default

In reply to Alexander Aring

This patch sets the default value of enable_waitplock_recovery to false as it is the same as the kernel configuration default. Note that in this specific case dlm_controld will not set the default value on startup. However this patch syncs the kernel and user land default behaviour.

---
 dlm_controld/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
dlm_controld/main.c +1 -1
index 3ec318c2..95107d09 100644
@@ -1754,7 +1754,7 @@ static void set_opt_defaults(void)
 
 	set_opt_default(enable_waitplock_recovery_ind,
 			"enable_waitplock_recovery", '\0', req_arg_bool,
-			1, NULL,
+			0, NULL,
 			"enable/disable posix lock to wait for dlm recovery after lock acquire");
 
 	set_opt_default(plock_debug_ind,
Signature · 1 line
2.26.2
#3 lore raw

PATCH 3/3 dlm_controld: add default value handling for unsigned int

In reply to Alexander Aring

This patch adds suppot to handle default values for unsigned int.

---
 dlm_controld/dlm_daemon.h |  1 +
 dlm_controld/main.c       | 61 +++++++++++++++++++++------------------
 2 files changed, 34 insertions(+), 28 deletions(-)
dlm_controld/dlm_daemon.h +1 -0
index 979aab7a..ee21c256 100644
@@ -134,6 +134,7 @@ struct dlm_option {
 
 	int default_int;
 	const char *default_str;
+	unsigned int default_uint;
 
 	int cli_set;
 	int cli_int;
dlm_controld/main.c +33 -28

191 lines not on this page · raw message

Signature · 1 line
2.26.2