libdm: avoid resume if preloaded device is smaller

When we preload device with smaller size, we avoid its resume,
so later suspend/resume of full device tree my process all
existing in flight bios.

Also update comment and avoid using confusing opposite meaning.

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index ac2d420200f97537c85e1779e1c1d7c386f570d0..47f647a6acca62752bfd1b849f2103eaf85d6705 100644 (file)
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
 Version 1.02.138 - 
 =====================================
+  Avoids immediate resume when preloaded device is smaller.
   Do not suppress kernel key description in dmsetup table output.
   Support configurable command executed from dmeventd thin plugin.
   Support new R|r human readable units output format.

diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 9570b8abbaadc9c703e6b38d66fe6191c94eeecb..d658bf99de5d980c96ca836d75f6c1f30f8df2df 100644 (file)
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -2874,8 +2874,8 @@ int dm_tree_preload_children(struct dm_tree_node *dnode,
                else if (child->props.size_changed < 0)
                        dnode->props.size_changed = -1;
 
-               /* Resume device immediately if it has parents and its size changed */
-               if (!dm_tree_node_num_children(child, 1) || !child->props.size_changed)
+               /* No resume for a device without parents or with unchanged or smaller size */
+               if (!dm_tree_node_num_children(child, 1) || (child->props.size_changed <= 0))
                        continue;
 
                if (!node_created && (dm_list_size(&child->props.segs) == 1)) {