From: lixiaokeng <lixiaokeng@huawei.com>
To: Martin Wilck <mwilck@suse.com>,
Benjamin Marzinski <bmarzins@redhat.com>,
Christophe Varoqui <christophe.varoqui@opensvc.com>,
dm-devel mailing list <dm-devel@redhat.com>
Cc: linfeilong <linfeilong@huawei.com>,
"liuzhiqiang (I)" <liuzhiqiang26@huawei.com>
Subject: [PATCH 13/14] multipath: use update_multipath_table/status in, check_useable_paths
Date: Wed, 2 Sep 2020 15:25:28 +0800 [thread overview]
Message-ID: <78021dc0-bede-f376-b450-40dd5522786b@huawei.com> (raw)
In-Reply-To: <37544d4c-950f-4281-3b66-e4d1884c5167@huawei.com>
The return values of dm_get_map, disassemble_map,dm_get_status
and disassemble_status in check_usable_paths were not checked.
Use update_multipath_table/status to instead of them.
Signed-off-by: Lixiaokeng <lixiaokeng@huawei.com>
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
Signed-off-by: Linfeilong <linfeilong@huawei.com>
---
multipath/main.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/multipath/main.c b/multipath/main.c
index d227e0b3..9e920d89 100644
--- a/multipath/main.c
+++ b/multipath/main.c
@@ -251,7 +251,6 @@ static int check_usable_paths(struct config *conf,
struct path *pp;
char *mapname;
vector pathvec = NULL;
- char params[PARAMS_SIZE], status[PARAMS_SIZE];
dev_t devt;
int r = 1, i, j;
@@ -285,11 +284,9 @@ static int check_usable_paths(struct config *conf,
if (mpp == NULL)
goto free;
- dm_get_map(mpp->alias, &mpp->size, params);
- dm_get_status(mpp->alias, status);
- disassemble_map(pathvec, params, mpp);
- update_pathvec_from_dm(pathvec, mpp, 0);
- disassemble_status(status, mpp);
+ if (update_multipath_table(mpp, pathvec, 0) != DMP_OK ||
+ update_multipath_status(mpp) != DMP_OK)
+ goto free;
vector_foreach_slot (mpp->pg, pg, i) {
vector_foreach_slot (pg->paths, pp, j) {
--
next prev parent reply other threads:[~2020-09-02 7:25 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 6:40 [PATCH 00/14] multipath-tools series: some cleanups and fixes checked by codedex tool lixiaokeng
2020-09-02 7:15 ` [PATCH 01/14] multipathd: return if dm_get_major_minor failed in, cli_add_map lixiaokeng
2020-09-03 17:26 ` Martin Wilck
2020-09-04 2:48 ` lixiaokeng
2020-09-04 13:13 ` Martin Wilck
2020-09-02 7:16 ` [PATCH 02/14] libmultipath: check malloc return value in, print_foreign_topology lixiaokeng
2020-09-03 17:29 ` Martin Wilck
2020-09-02 7:17 ` [PATCH 03/14] libmultipath: use map instead of dm_task_get_name lixiaokeng
2020-09-03 17:35 ` Martin Wilck
2020-09-02 7:17 ` [PATCH 04/14] multipathd: check MALLOC return value in, mpath_pr_event_handler_fn lixiaokeng
2020-09-03 18:57 ` Martin Wilck
2020-09-02 7:18 ` [PATCH 05/14] multipathd: use MALLOC and check return value in, cli_getprkey func lixiaokeng
2020-09-03 19:13 ` Martin Wilck
2020-09-04 18:25 ` Benjamin Marzinski
2020-09-04 21:24 ` Martin Wilck
2020-09-02 7:19 ` [PATCH 06/14] kpartx: check return value of malloc in main func lixiaokeng
2020-09-03 19:23 ` Martin Wilck
2020-09-02 7:19 ` [PATCH 07/14] libmultipath: check return value of dm_mapname in, sysfs_check_holders lixiaokeng
2020-09-04 20:28 ` Benjamin Marzinski
2020-09-02 7:20 ` [PATCH 08/14] libmultipath: donot free *dst if REALLOC fails in, merge_words lixiaokeng
2020-09-04 21:11 ` Benjamin Marzinski
2020-09-07 11:58 ` lixiaokeng
2020-09-02 7:21 ` [PATCH 09/14] libmultipath: check whether mp->features is NULl in, assemble_map lixiaokeng
2020-09-04 21:30 ` Benjamin Marzinski
2020-09-07 12:21 ` lixiaokeng
2020-09-08 15:45 ` Benjamin Marzinski
2020-09-08 16:35 ` Martin Wilck
2020-09-08 16:44 ` Benjamin Marzinski
2020-09-09 3:18 ` lixiaokeng
2020-09-09 10:11 ` Martin Wilck
2020-09-02 7:22 ` [PATCH 10/14] util/tests: use assert_non_null to ensure malloc, returns non-null pointer lixiaokeng
2020-09-04 21:31 ` Benjamin Marzinski
2020-09-02 7:23 ` [PATCH 11/14] mpathpersist: check whether malloc paramp->trnptid_list, fails in handle_args func lixiaokeng
2020-09-04 23:52 ` Benjamin Marzinski
2020-09-07 12:26 ` lixiaokeng
2020-09-02 7:24 ` [PATCH 12/14] libmultipathpersist: use update_multipath_table/status, in get_mpvec lixiaokeng
2020-09-05 0:05 ` Benjamin Marzinski
2020-09-07 13:26 ` lixiaokeng
2020-09-07 14:33 ` Martin Wilck
2020-09-02 7:25 ` lixiaokeng [this message]
2020-09-05 0:10 ` [PATCH 13/14] multipath: use update_multipath_table/status in, check_useable_paths Benjamin Marzinski
2020-09-02 7:26 ` [PATCH 14/14] multipathpersist: delete unused variable in handle_args lixiaokeng
2020-09-05 0:14 ` Benjamin Marzinski
2020-09-03 20:08 ` [PATCH 00/14] multipath-tools series: some cleanups and fixes checked by codedex tool Martin Wilck
2020-09-04 2:24 ` lixiaokeng
2020-09-04 20:00 ` Benjamin Marzinski
2020-09-04 21:28 ` Martin Wilck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=78021dc0-bede-f376-b450-40dd5522786b@huawei.com \
--to=lixiaokeng@huawei.com \
--cc=bmarzins@redhat.com \
--cc=christophe.varoqui@opensvc.com \
--cc=dm-devel@redhat.com \
--cc=linfeilong@huawei.com \
--cc=liuzhiqiang26@huawei.com \
--cc=mwilck@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.