shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

thin: fix test for dicards ignore settings

Browse Source 
Arghh, this was bad last-minute shortening of if() expression
in the commit 1ef9831018.

dm_tree_node_set_thin_pool_discard() must not run in the same
expression as check for non-power-2 discard, otherwise
there are 2 calls for dm_tree_node_set_thin_pool_discard
and whole setting of discards is missinterpretted.

In-relase fix it by using proper parentheses {}.
This commit is contained in:
Zdenek Kabelac 2012-12-10 10:22:48 +01:00
parent ed65860861
commit 17be6d5210
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/thin/thin.c
View File

@ -289,11 +289,11 @@ static int _thin_pool_add_target_line(struct dev_manager *dm,
/* FIXME: Check whether underlying dev supports discards */ /* FIXME: Check whether underlying dev supports discards */
if (((!(attr & THIN_FEATURE_DISCARDS_NON_POWER_2) && if (((!(attr & THIN_FEATURE_DISCARDS_NON_POWER_2) &&
(seg->chunk_size & (seg->chunk_size - 1))) || (seg->chunk_size & (seg->chunk_size - 1))) ||
(seg->discards == THIN_DISCARDS_IGNORE)) && (seg->discards == THIN_DISCARDS_IGNORE))) {
!dm_tree_node_set_thin_pool_discard(node, 1, 0)) if (!dm_tree_node_set_thin_pool_discard(node, 1, 0))
return_0; return_0;
else if (!dm_tree_node_set_thin_pool_discard(node, 0, } else if (!dm_tree_node_set_thin_pool_discard(node, 0,
(seg->discards == THIN_DISCARDS_NO_PASSDOWN))) (seg->discards == THIN_DISCARDS_NO_PASSDOWN)))
return_0; return_0;
} else if (seg->discards != THIN_DISCARDS_IGNORE) } else if (seg->discards != THIN_DISCARDS_IGNORE)
log_warn_suppress(_no_discards++, "WARNING: Thin pool target does " log_warn_suppress(_no_discards++, "WARNING: Thin pool target does "