[PATCH v2 04/12] libmultipath: use MAPINFO_CHECK_UUID in dm_get_multipath

[Martin Wilck]

From: Benjamin Marzinski <bmarz...@redhat.com>

Instead of seperately calling is_mpath_uuid(), just use
MAPINFO_CHECK_UUID when calling libmp_mapinfo.

Signed-off-by: Benjamin Marzinski <bmarz...@redhat.com>
Reviewed-by: Martin Wilck <mwi...@suse.com>
---
 libmultipath/devmapper.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
index 93fbc4a..d193586 100644
--- a/libmultipath/devmapper.c
+++ b/libmultipath/devmapper.c
@@ -1211,7 +1211,8 @@ static int dm_get_multipath(const char *name, struct 
multipath **pmpp)
        if (!mpp->alias)
                return DMP_ERR;
 
-       if ((rc = libmp_mapinfo(DM_MAP_BY_NAME | MAPINFO_MPATH_ONLY,
+       if ((rc = libmp_mapinfo(DM_MAP_BY_NAME | MAPINFO_CHECK_UUID |
+                               MAPINFO_MPATH_ONLY,
                          (mapid_t) { .str = name },
                          (mapinfo_t) {
                                  .size = &mpp->size,
@@ -1220,9 +1221,6 @@ static int dm_get_multipath(const char *name, struct 
multipath **pmpp)
                          })) != DMP_OK)
                return rc;
 
-       if (!is_mpath_uuid(uuid))
-               return DMP_NO_MATCH;
-
        strlcpy(mpp->wwid, uuid + UUID_PREFIX_LEN, sizeof(mpp->wwid));
        *pmpp = steal_ptr(mpp);
 
-- 
2.47.0