From 66abd8c7a8921e0e0a60983311c74f1496536368 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Fri, 26 Aug 2011 13:09:41 -0400 Subject: [PATCH] Revert "Also export UDISKS_DM_TARGET_PARAMS for 'multipath' target" This reverts commit e014838956eb2d926ce2db28b48d202e4fae9db7. --- src/device.c | 3 +-- src/probers/udisks-dm-export.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/device.c b/src/device.c index 91c6cd1..3602f0f 100644 --- a/src/device.c +++ b/src/device.c @@ -3338,8 +3338,7 @@ update_info_partition_on_linux_dmmp (Device *device) targets_type = g_udev_device_get_property_as_strv (device->priv->d, "UDISKS_DM_TARGETS_TYPE"); /* If we ever need this for other types than "linear", remember to update udisks-dm-export.c as well. */ - if (targets_type == NULL || !(g_strcmp0 (targets_type[0], "linear") == 0 || - g_strcmp0 (targets_type[0], "multipath") == 0)) + if (targets_type == NULL || g_strcmp0 (targets_type[0], "linear") != 0) goto out; targets_params = g_udev_device_get_property_as_strv (device->priv->d, "UDISKS_DM_TARGETS_PARAMS"); diff --git a/src/probers/udisks-dm-export.c b/src/probers/udisks-dm-export.c index 86da709..8fff4f9 100644 --- a/src/probers/udisks-dm-export.c +++ b/src/probers/udisks-dm-export.c @@ -290,9 +290,7 @@ dm_export (int major, int minor) /* Set target_params for known-safe and known-needed target types only. In particular, * we must not export it for "crypto", since that would expose * information about the key. */ - if ((g_strcmp0 (target_type, "linear") == 0 || - g_strcmp0 (target_type, "multipath") == 0) - && params != NULL && strlen (params) > 0) + if (g_strcmp0 (target_type, "linear") == 0 && params != NULL && strlen (params) > 0) { _udev_util_encode_string (params, buf, sizeof (buf)); g_string_append (params_str, buf); -- 2.7.4