Revert free of allocated segtype

lvm_register_segtype takes ownership of segtype and call destructor
for it in error path.

diff --git a/WHATS_NEW b/WHATS_NEW
index a3f888548f1691791ad11ca61ceac3819da70a37..448a73d21dbb596688c6d50c050e8ef50cb5ff99 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.94 - 
 ====================================
+  Revert free of allocated segtype in init segment error path (2.02.89).
   Test dm_hash_insert() failures in filter-persistent.c and fid_add_mda().
   Ensure clvmd message is always \0 terminated after read.
   Better detection of missing dmeventd fifo connection (2.02.93).

diff --git a/lib/raid/raid.c b/lib/raid/raid.c
index 354ca5087b418c16faacfe3592c32939806a3c67..097d36f44f4946c01d3fc1132e4316fce9717458 100644 (file)
--- a/lib/raid/raid.c
+++ b/lib/raid/raid.c
@@ -456,10 +456,9 @@ int init_multiple_segtypes(struct cmd_context *cmd, struct segtype_library *segl
 
        do {
                if ((segtype = raid_segtype_fn[i](cmd)) &&
-                   !lvm_register_segtype(seglib, segtype)) {
-                       dm_free(segtype);
+                   !lvm_register_segtype(seglib, segtype))
+                       /* segtype is already destroyed */
                        return_0;
-               }
        } while (raid_segtype_fn[++i]);
 
        return 1;

diff --git a/lib/replicator/replicator.c b/lib/replicator/replicator.c
index 1203349e0a3d718a891337e7449a699c726fa3b2..2571e81351dd5edbc5804a6522b2233fd50c950e 100644 (file)
--- a/lib/replicator/replicator.c
+++ b/lib/replicator/replicator.c
@@ -772,10 +772,9 @@ int init_multiple_segtype(struct cmd_context *cmd, struct segtype_library *segli
        segtype->private = NULL;
        segtype->flags = SEG_REPLICATOR;
 
-       if (!lvm_register_segtype(seglib, segtype)) {
-               dm_free(segtype);
+       if (!lvm_register_segtype(seglib, segtype))
+               /* segtype is already destroyed */
                return_0;
-       }
 
        log_very_verbose("Initialised segtype: " REPLICATOR_MODULE);
 
@@ -787,10 +786,9 @@ int init_multiple_segtype(struct cmd_context *cmd, struct segtype_library *segli
        segtype->private = NULL;
        segtype->flags = SEG_REPLICATOR_DEV;
 
-       if (!lvm_register_segtype(seglib, segtype)) {
-               dm_free(segtype);
+       if (!lvm_register_segtype(seglib, segtype))
+               /* segtype is already destroyed */
                return_0;
-       }
 
        log_very_verbose("Initialised segtype: " REPLICATOR_DEV_MODULE);
 

diff --git a/lib/thin/thin.c b/lib/thin/thin.c
index ccf0f8daa46214f1717e5d53444f6ff8cd9b1980..65b130b8ebc2fc51c07504626afe6d33257211ef 100644 (file)
--- a/lib/thin/thin.c
+++ b/lib/thin/thin.c
@@ -607,10 +607,9 @@ int init_multiple_segtypes(struct cmd_context *cmd, struct segtype_library *segl
                        segtype->flags |= SEG_MONITORED;
 #  endif /* DMEVENTD */
 #endif
-               if (!lvm_register_segtype(seglib, segtype)) {
-                       dm_free(segtype);
+               if (!lvm_register_segtype(seglib, segtype))
+                       /* segtype is already destroyed */
                        return_0;
-               }
 
                log_very_verbose("Initialised segtype: %s", segtype->name);
        }