shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

cache: with cache target 1.9 mq is alias to smq

Browse Source 
Avoid useless check for mq policy, it's loaded as smq
and aliased.
This commit is contained in:
Zdenek Kabelac 2016-04-26 21:43:41 +02:00
parent aa91fe3d3c
commit 588455d03e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.152 - Version 2.02.152 -
================================== ==================================
Stop checking for dm_cache_mq policy with cache target 1.9 (alias to smq).
Check first /sys/module/dm_* dir existance before using modprobe. Check first /sys/module/dm_* dir existance before using modprobe.
Remove mpath from 10-dm.rules, superseded by 11-dm-mpath.rules (mpath>=0.6.0). Remove mpath from 10-dm.rules, superseded by 11-dm-mpath.rules (mpath>=0.6.0).

7
lib/cache_segtype/cache.c
View File

@ -211,8 +211,9 @@ static int _target_present(struct cmd_context *cmd,
const char feature[12]; const char feature[12];
const char module[12]; /* check dm-%s */ const char module[12]; /* check dm-%s */
} _features[] = { } _features[] = {
{ 1, 3, CACHE_FEATURE_POLICY_MQ, "policy_mq", "cache-mq" }, { 1, 9, CACHE_FEATURE_POLICY_SMQ | CACHE_FEATURE_POLICY_MQ, "policy_smq", "cache-smq" },
{ 1, 8, CACHE_FEATURE_POLICY_SMQ, "policy_smq", "cache-smq" }, { 1, 8, CACHE_FEATURE_POLICY_SMQ, "policy_smq", "cache-smq" },
{ 1, 3, CACHE_FEATURE_POLICY_MQ, "policy_mq", "cache-mq" },
}; };
static const char _lvmconf[] = "global/cache_disabled_features"; static const char _lvmconf[] = "global/cache_disabled_features";
static unsigned _attrs = 0; static unsigned _attrs = 0;
@ -249,7 +250,9 @@ static int _target_present(struct cmd_context *cmd,
for (i = 0; i < DM_ARRAY_SIZE(_features); ++i) { for (i = 0; i < DM_ARRAY_SIZE(_features); ++i) {
if (((maj > _features[i].maj) || if (((maj > _features[i].maj) ||
(maj == _features[i].maj && min >= _features[i].min)) && (maj == _features[i].maj && min >= _features[i].min)) &&
(!_features[i].module[0] || module_present(cmd, _features[i].module))) (!_features[i].module[0] ||
(_attrs & _features[i].cache_feature) || /* already present */
module_present(cmd, _features[i].module)))
_attrs |= _features[i].cache_feature; _attrs |= _features[i].cache_feature;
else else
log_very_verbose("Target %s does not support %s.", log_very_verbose("Target %s does not support %s.",