[lvm-devel] master - libdm: split code for sending message
Zdenek Kabelac
zkabelac at sourceware.org
Tue Oct 20 20:34:08 UTC 2020
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4c1caa7e26b6f8011ca083395650d11943a42a8a
Commit: 4c1caa7e26b6f8011ca083395650d11943a42a8a
Parent: 58976ccc34f9c60471e630666417a1fcef4d9799
Author: Zdenek Kabelac <zkabelac at redhat.com>
AuthorDate: Sat Jun 23 21:00:40 2018 +0200
Committer: Zdenek Kabelac <zkabelac at redhat.com>
CommitterDate: Mon Oct 19 16:53:18 2020 +0200
libdm: split code for sending message
Move message sending from _thin_pool_node_message to
new _node_message for possible better code sharing.
---
libdm/libdm-deptree.c | 62 ++++++++++++++++++++++++++++++---------------------
1 file changed, 36 insertions(+), 26 deletions(-)
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index ee12da2b2..887e8f275 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -1428,9 +1428,41 @@ out:
return r;
}
-static int _thin_pool_node_message(struct dm_tree_node *dnode, struct thin_message *tm)
+static int _node_message(uint32_t major, uint32_t minor,
+ int expected_errno, const char *message)
{
struct dm_task *dmt;
+ int r = 0;
+
+ if (!(dmt = dm_task_create(DM_DEVICE_TARGET_MSG)))
+ return_0;
+
+ if (!dm_task_set_major(dmt, major) ||
+ !dm_task_set_minor(dmt, minor)) {
+ log_error("Failed to set message major minor.");
+ goto out;
+ }
+
+ if (!dm_task_set_message(dmt, message))
+ goto_out;
+
+ /* Internal functionality of dm_task */
+ dmt->expected_errno = expected_errno;
+
+ if (!dm_task_run(dmt)) {
+ log_error("Failed to process message \"%s\".", message);
+ goto out;
+ }
+
+ r = 1;
+out:
+ dm_task_destroy(dmt);
+
+ return r;
+}
+
+static int _thin_pool_node_message(struct dm_tree_node *dnode, struct thin_message *tm)
+{
struct dm_thin_message *m = &tm->message;
char buf[64];
int r;
@@ -1470,33 +1502,11 @@ static int _thin_pool_node_message(struct dm_tree_node *dnode, struct thin_messa
return 0;
}
- r = 0;
-
- if (!(dmt = dm_task_create(DM_DEVICE_TARGET_MSG)))
+ if (!_node_message(dnode->info.major, dnode->info.minor,
+ tm->expected_errno, buf))
return_0;
- if (!dm_task_set_major(dmt, dnode->info.major) ||
- !dm_task_set_minor(dmt, dnode->info.minor)) {
- log_error("Failed to set message major minor.");
- goto out;
- }
-
- if (!dm_task_set_message(dmt, buf))
- goto_out;
-
- /* Internal functionality of dm_task */
- dmt->expected_errno = tm->expected_errno;
-
- if (!dm_task_run(dmt)) {
- log_error("Failed to process thin pool message \"%s\".", buf);
- goto out;
- }
-
- r = 1;
-out:
- dm_task_destroy(dmt);
-
- return r;
+ return 1;
}
static struct load_segment *_get_last_load_segment(struct dm_tree_node *node)
More information about the lvm-devel
mailing list