diff options
Diffstat (limited to 'lib/misc')
-rw-r--r-- | lib/misc/lvm-globals.c | 11 | ||||
-rw-r--r-- | lib/misc/lvm-globals.h | 4 | ||||
-rw-r--r-- | lib/misc/sharedlib.c | 2 |
3 files changed, 1 insertions, 16 deletions
diff --git a/lib/misc/lvm-globals.c b/lib/misc/lvm-globals.c index b76ddb9c4..937758841 100644 --- a/lib/misc/lvm-globals.c +++ b/lib/misc/lvm-globals.c @@ -34,7 +34,6 @@ static int _trust_cache = 0; /* Don't scan when incomplete VGs encountered */ static int _debug_level = 0; static int _debug_classes_logged = 0; static int _log_cmd_name = 0; -static int _ignorelockingfailure = 0; static int _security_level = SECURITY_LEVEL; static char _cmd_name[30] = ""; static int _mirror_in_sync = 0; @@ -106,11 +105,6 @@ void init_trust_cache(int trustcache) _trust_cache = trustcache; } -void init_ignorelockingfailure(int level) -{ - _ignorelockingfailure = level; -} - void init_security_level(int level) { _security_level = level; @@ -267,11 +261,6 @@ int background_polling(void) return _background_polling; } -int ignorelockingfailure(void) -{ - return _ignorelockingfailure; -} - int security_level(void) { return _security_level; diff --git a/lib/misc/lvm-globals.h b/lib/misc/lvm-globals.h index b3838911f..55a9399c6 100644 --- a/lib/misc/lvm-globals.h +++ b/lib/misc/lvm-globals.h @@ -35,8 +35,6 @@ void init_trust_cache(int trustcache); void init_debug(int level); void init_debug_classes_logged(int classes); void init_cmd_name(int status); -void init_ignorelockingfailure(int level); -void init_lockingfailed(int level); void init_security_level(int level); void init_mirror_in_sync(int in_sync); void init_dmeventd_monitor(int reg); @@ -69,8 +67,6 @@ int verbose_level(void); int silent_mode(void); int debug_level(void); int debug_class_is_logged(int class); -int ignorelockingfailure(void); -int lockingfailed(void); int security_level(void); int mirror_in_sync(void); int background_polling(void); diff --git a/lib/misc/sharedlib.c b/lib/misc/sharedlib.c index d59447012..4c2d5d9b3 100644 --- a/lib/misc/sharedlib.c +++ b/lib/misc/sharedlib.c @@ -58,7 +58,7 @@ void *load_shared_library(struct cmd_context *cmd, const char *libname, log_very_verbose("Opening shared %s library %s", desc, path); if (!(library = dlopen(path, RTLD_LAZY | RTLD_GLOBAL))) { - if (silent && ignorelockingfailure()) + if (silent) log_verbose("Unable to open external %s library %s: %s", desc, path, dlerror()); else |