summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2020-10-19 16:48:04 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2020-10-19 16:53:19 +0200
commit756066a2e85062be5e406d9139fc1033746d7ff9 (patch)
tree65901d9b93938d6a30a5b18498dced15c9fa6b68
parent3e06061d82dbcc2f464f0fdcd6610f25177bfa1f (diff)
downloadlvm2-756066a2e85062be5e406d9139fc1033746d7ff9.tar.gz
libdm: relocate code for sending messages
To be able to send messages for recently resumed devices, move code into inner loop. Matching commit c1a6b10d09aae6179e4f08c7d8c03d5e3068ad94.
-rw-r--r--libdm/libdm-deptree.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index e784cbc9c..f16db8568 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -1966,22 +1966,22 @@ int dm_tree_activate_children(struct dm_tree_node *dnode,
r = 0;
continue;
}
+
+ /*
+ * FIXME: Implement delayed error reporting
+ * activation should be stopped only in the case,
+ * the submission of transation_id message fails,
+ * resume should continue further, just whole command
+ * has to report failure.
+ */
+ if (r && (child->props.send_messages > 1) &&
+ !(r = _node_send_messages(child, uuid_prefix, uuid_prefix_len, 1)))
+ stack;
}
if (awaiting_peer_rename)
priority--; /* redo priority level */
}
- /*
- * FIXME: Implement delayed error reporting
- * activation should be stopped only in the case,
- * the submission of transation_id message fails,
- * resume should continue further, just whole command
- * has to report failure.
- */
- if (r && (dnode->props.send_messages > 1) &&
- !(r = _node_send_messages(dnode, uuid_prefix, uuid_prefix_len, 1)))
- stack;
-
return r;
}