diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2015-07-09 16:34:02 +0200 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2015-07-09 16:34:08 +0200 |
| commit | 14811250420630d9f2f5f9aa3de7e8893b53e53b (patch) | |
| tree | 2ab5ad22d75984535b8a4e0711c31cb8f9d64aa1 | |
| parent | 10d27998b3d2f6100e9e29e83d1d99948c55875f (diff) | |
| download | lvm2-14811250420630d9f2f5f9aa3de7e8893b53e53b.tar.gz | |
libdaemon: config_make_nodes_v needs fixing
Put the change from commit #10d27998b3d2f6100e9e29e83d1d99948c55875f
back so we have working tree again for now. This code needs a bit of
a cleanup to return proper return value to check...
| -rw-r--r-- | lib/cache/lvmetad.c | 9 | ||||
| -rw-r--r-- | libdaemon/client/config-util.c | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c index d22df75b3..60f0277b1 100644 --- a/lib/cache/lvmetad.c +++ b/lib/cache/lvmetad.c @@ -148,13 +148,12 @@ static int _lvmetad_pvscan_all_devs(struct cmd_context *cmd, activation_handler static daemon_reply _lvmetad_send(const char *id, ...) { va_list ap; - daemon_reply repl; + daemon_reply repl = { 0 }; daemon_request req; unsigned num_rescans = 0; unsigned total_usecs_waited = 0; unsigned max_remaining_sleep_times = 1; unsigned wait_usecs; - int r; retry: req = daemon_request_make(id); @@ -165,12 +164,8 @@ retry: } va_start(ap, id); - r = daemon_request_extend_v(req, ap); + daemon_request_extend_v(req, ap); va_end(ap); - if (!r) { - repl.error = ENOMEM; - return repl; - } repl = daemon_send(_lvmetad, req); diff --git a/libdaemon/client/config-util.c b/libdaemon/client/config-util.c index 895815c31..023257e2f 100644 --- a/libdaemon/client/config-util.c +++ b/libdaemon/client/config-util.c @@ -208,6 +208,10 @@ struct dm_config_node *make_int_node(struct dm_config_tree *cft, return cn; } +/* + * FIXME: return 1 even if VA list is empty and return the + * dm_config_node* result as output parameter + */ struct dm_config_node *config_make_nodes_v(struct dm_config_tree *cft, struct dm_config_node *parent, struct dm_config_node *pre_sib, |