Fix log_error() usage

Cosmetic - skip <bactrace> when error has been just printed in raid segtype.
Add missing log_error if allocation would fail for unknown segtype.

diff --git a/WHATS_NEW b/WHATS_NEW
index 8dba1ffa20d0343dcfdf7ba6da52d502d52f7aba..7bdaaf26ae08153d6f6172bcf2d5b89fa71d52b1 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.89 - 
 ==================================
+  Fix log_error() usage in raid and unknown segtype initialisation.
   Improve testing Makefile.
   Fix install_ocf make target when srcdir != builddir. (2.02.80)
   Support env vars LVM_CLVMD_BINARY and LVM_BINARY in clvmd.

diff --git a/lib/raid/raid.c b/lib/raid/raid.c
index 8bc334400a76794b7ef6ac123afed19c1ae4a651..c3fc4b13c100c60639d98893addbebcb4ec06b39 100644 (file)
--- a/lib/raid/raid.c
+++ b/lib/raid/raid.c
@@ -338,7 +338,7 @@ static struct segment_type *_init_raid_segtype(struct cmd_context *cmd,
        if (!segtype) {
                log_error("Failed to allocate memory for %s segtype",
                          raid_type);
-               return_NULL;
+               return NULL;
        }
        segtype->cmd = cmd;
 

diff --git a/lib/unknown/unknown.c b/lib/unknown/unknown.c
index de449bfe0e835b577566c066c6574c23545c6f4f..8f5c8096c674bb02bcc1899e754077c3f5391010 100644 (file)
--- a/lib/unknown/unknown.c
+++ b/lib/unknown/unknown.c
@@ -94,8 +94,10 @@ struct segment_type *init_unknown_segtype(struct cmd_context *cmd, const char *n
 {
        struct segment_type *segtype = dm_zalloc(sizeof(*segtype));
 
-       if (!segtype)
-               return_NULL;
+       if (!segtype) {
+               log_error("Failed to allocate memory for unknown segtype");
+               return NULL;
+       }
 
        segtype->cmd = cmd;
        segtype->ops = &_unknown_ops;