From e4cfe7eb21934791ce12da1f9fe8b5faba743800 Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Thu, 14 Aug 2008 12:05:39 +0000 Subject: [PATCH] Revert config_verifyconf logic that is unnecessary git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1631 fd59a12c-fef9-0310-b244-a6a79926bd2f --- exec/config.h | 1 - exec/objdb.c | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/exec/config.h b/exec/config.h index e1b73603..eea57032 100644 --- a/exec/config.h +++ b/exec/config.h @@ -38,7 +38,6 @@ struct config_iface_ver0 { int (*config_readconfig) (struct objdb_iface_ver0 *objdb, char **error_string); int (*config_writeconfig) (struct objdb_iface_ver0 *objdb, char **error_string); - int (*config_verifyconfig) (struct objdb_iface_ver0 *objdb, char **error_string); int (*config_reloadconfig) (struct objdb_iface_ver0 *objdb, int flush, char **error_string); }; diff --git a/exec/objdb.c b/exec/objdb.c index b2a87a4d..6f3e1a17 100644 --- a/exec/objdb.c +++ b/exec/objdb.c @@ -1424,17 +1424,6 @@ static int object_reload_config(int flush, char **error_string) main_get_config_modules(&modules, &num_modules); - /* phase 1. Each module should verify that it can reload the config - * and error out here if possible at all - */ - for (i=0; iconfig_verifyconfig) { - res = modules[i]->config_verifyconfig(&objdb_iface, error_string); - if (res) - return res; - } - } - /* phase 2. Do it.. */ for (i=0; iconfig_reloadconfig) { res = modules[i]->config_reloadconfig(&objdb_iface, flush, error_string);