From f5585f5839b51e734d28059f8a6b6d92ce036d93 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Mon, 17 Dec 2018 10:36:49 +0100 Subject: [PATCH] Use major/minor macros from sys/sysmacros.h instead of linux/kdev_t.h The macros from linux/kdev_t.h don't work for devices with minor > 255. Resolves: rhbz#1644825 --- src/plugins/mpath.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/mpath.c b/src/plugins/mpath.c index 4fb75849..639c00b9 100644 --- a/src/plugins/mpath.c +++ b/src/plugins/mpath.c @@ -18,8 +18,8 @@ */ #include -/* provides MAJOR, MINOR macros */ -#include +/* provides major and minor macros */ +#include #include #include #include @@ -273,8 +273,8 @@ static gboolean map_is_multipath (const gchar *map_name, GError **error) { static gchar** get_map_deps (const gchar *map_name, guint64 *n_deps, GError **error) { struct dm_task *task; struct dm_deps *deps; - guint64 major = 0; - guint64 minor = 0; + guint64 dev_major = 0; + guint64 dev_minor = 0; guint64 i = 0; gchar **dep_devs = NULL; gchar *major_minor = NULL; @@ -319,9 +319,9 @@ static gchar** get_map_deps (const gchar *map_name, guint64 *n_deps, GError **er dep_devs = g_new0 (gchar*, deps->count + 1); for (i = 0; i < deps->count; i++) { - major = (guint64) MAJOR(deps->device[i]); - minor = (guint64) MINOR(deps->device[i]); - major_minor = g_strdup_printf ("%"G_GUINT64_FORMAT":%"G_GUINT64_FORMAT, major, minor); + dev_major = (guint64) major (deps->device[i]); + dev_minor = (guint64) minor (deps->device[i]); + major_minor = g_strdup_printf ("%"G_GUINT64_FORMAT":%"G_GUINT64_FORMAT, dev_major, dev_minor); dep_devs[i] = get_device_name (major_minor, error); if (*error) { g_prefix_error (error, "Failed to resolve '%s' to device name",