mirror of
git://sourceware.org/git/lvm2.git
synced 2024-10-03 17:50:03 +03:00
Revert "libdm: fix condition"
This reverts commit 2a1e200f7a
.
Breaks some test - more analysis is needed.
This commit is contained in:
parent
f3d3d4a07d
commit
d16a8f80e9
@ -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",
|
||||
|
@ -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",
|
||||
|
Loading…
Reference in New Issue
Block a user