Revert "libdm: fix condition"

This reverts commit 2a1e200f7af3d4c52afbb4627c8cf87f98baa71e.

Breaks some test - more analysis is needed.

diff --git a/device_mapper/libdm-report.c b/device_mapper/libdm-report.c
index 97a5742adbe88d49609a90098548c23f71ec99e6..2dca2513ef3e2acf4676a4beb1d1065b78b0ad63 100644 (file)
--- a/device_mapper/libdm-report.c
+++ b/device_mapper/libdm-report.c
@@ -2589,8 +2589,7 @@ static int _check_reserved_values_supported(const struct dm_report_field_type fi
                if (iter->type & DM_REPORT_FIELD_TYPE_MASK) {
                        if (!(iter->type & supported_reserved_types) ||
                            ((iter->type & DM_REPORT_FIELD_RESERVED_VALUE_RANGE) &&
-                            !(iter->type & (supported_reserved_types_with_range &
-                                            ~DM_REPORT_FIELD_RESERVED_VALUE_RANGE)))) {
+                            !(iter->type & supported_reserved_types_with_range))) {
                                log_error(INTERNAL_ERROR "_check_reserved_values_supported: "
                                          "global reserved value for type 0x%x not supported",
                                           iter->type);
@@ -2601,8 +2600,7 @@ static int _check_reserved_values_supported(const struct dm_report_field_type fi
                        field = &fields[field_res->field_num];
                        if (!(field->flags & supported_reserved_types) ||
                            ((iter->type & DM_REPORT_FIELD_RESERVED_VALUE_RANGE) &&
-                            !(iter->type & (supported_reserved_types_with_range &
-                                            ~DM_REPORT_FIELD_RESERVED_VALUE_RANGE)))) {
+                            !(iter->type & supported_reserved_types_with_range))) {
                                log_error(INTERNAL_ERROR "_check_reserved_values_supported: "
                                          "field-specific reserved value of type 0x%x for "
                                          "field %s not supported",

diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c
index 32466cdb40d9340a456b6682c8f677b55243f3f9..779a10d3f7e0b9cf94ddd05e15e4f508b098b100 100644 (file)
--- a/libdm/libdm-report.c
+++ b/libdm/libdm-report.c
@@ -2587,8 +2587,7 @@ static int _check_reserved_values_supported(const struct dm_report_field_type fi
                if (iter->type & DM_REPORT_FIELD_TYPE_MASK) {
                        if (!(iter->type & supported_reserved_types) ||
                            ((iter->type & DM_REPORT_FIELD_RESERVED_VALUE_RANGE) &&
-                            !(iter->type & (supported_reserved_types_with_range &
-                                            ~DM_REPORT_FIELD_RESERVED_VALUE_RANGE)))) {
+                            !(iter->type & supported_reserved_types_with_range))) {
                                log_error(INTERNAL_ERROR "_check_reserved_values_supported: "
                                          "global reserved value for type 0x%x not supported",
                                           iter->type);
@@ -2599,8 +2598,7 @@ static int _check_reserved_values_supported(const struct dm_report_field_type fi
                        field = &fields[field_res->field_num];
                        if (!(field->flags & supported_reserved_types) ||
                            ((iter->type & DM_REPORT_FIELD_RESERVED_VALUE_RANGE) &&
-                            !(iter->type & (supported_reserved_types_with_range &
-                                            ~DM_REPORT_FIELD_RESERVED_VALUE_RANGE)))) {
+                            !(iter->type & supported_reserved_types_with_range))) {
                                log_error(INTERNAL_ERROR "_check_reserved_values_supported: "
                                          "field-specific reserved value of type 0x%x for "
                                          "field %s not supported",