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 recent commits

Browse Source
This commit is contained in:
Alasdair G Kergon 2012-08-07 21:59:06 +01:00
parent 701b4a8363
commit 7ecccc3099
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/thin/thin.c
View File

@ -115,7 +115,7 @@ static int _thin_pool_text_import(struct lv_segment *seg,
return SEG_LOG_ERROR("Could not read chunk_size"); return SEG_LOG_ERROR("Could not read chunk_size");
if (dm_config_has_node(sn, "discards") && if (dm_config_has_node(sn, "discards") &&
!dm_config_get_str(sn, "discards", &discard_str)) !dm_config_get_str(sn, "discards", &discards_str))
return SEG_LOG_ERROR("Could not read discards for"); return SEG_LOG_ERROR("Could not read discards for");
if (!discards_str) if (!discards_str)
@ -276,16 +276,15 @@ static int _thin_pool_add_target_line(struct dev_manager *dm,
seg->zero_new_blocks ? 0 : 1)) seg->zero_new_blocks ? 0 : 1))
return_0; return_0;
if (seg->discards != THIN_DISCARDS_PASSDOWN) if ((seg->discards != THIN_DISCARDS_PASSDOWN) && (attr & THIN_FEATURE_DISCARDS)) {
if (attr & THIN_FEATURE_DISCARDS) { /* FIXME: Check whether underlying dev supports discards */
/* FIXME: Check whether underlying dev supports discards */ if (!dm_tree_node_set_thin_pool_discard(node,
if (!dm_tree_node_set_thin_pool_discard(node, seg->discards == THIN_DISCARDS_IGNORE,
seg->discards == THIN_DISCARDS_IGNORE, seg->discards == THIN_DISCARDS_NO_PASSDOWN))
seg->discards == THIN_DISCARDS_NO_PASSDOWN)) return_0;
return_0; } else
} else log_warn_suppress(_no_discards++, "WARNING: Thin pool target does "
log_warn_suppress(_no_discards++, "WARNING: Thin pool target does " "not support discards (needs kernel >= 3.4).");
"not support discards (needs kernel >= 3.4).");
/* /*
* Add messages only for activation tree. * Add messages only for activation tree.