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: for thin volumes properly list modules

Browse Source 
thin volume needs   thin-pool and  thin kernel modules so print them
both for   lvs -o+modules
This commit is contained in:
Zdenek Kabelac 2013-07-18 16:06:26 +02:00
parent d72f34af41
commit 4e724f5f52
3 changed files with 30 additions and 11 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.99 - Version 2.02.99 -
=================================== ===================================
List thin-pool and thin modules for thin volumes.
Correct thin creation error paths. Correct thin creation error paths.
Use local activation for clearing snapshot COW device. Use local activation for clearing snapshot COW device.
Add lvm2-activation-net systemd unit to activate LVs on net-attached storage. Add lvm2-activation-net systemd unit to activate LVs on net-attached storage.

38
lib/thin/thin.c
View File

@ -27,7 +27,8 @@
#endif #endif
/* Dm kernel module name for thin provisiong */ /* Dm kernel module name for thin provisiong */
#define THIN_MODULE "thin-pool" static const char _thin_pool_module[] = "thin-pool";
static const char _thin_module[] = "thin";
/* /*
* Macro used as return argument - returns 0. * Macro used as return argument - returns 0.
@ -376,6 +377,18 @@ static int _thin_pool_target_percent(void **target_state __attribute__((unused))
return 1; return 1;
} }
static int _thin_pool_modules_needed(struct dm_pool *mem,
const struct lv_segment *seg __attribute__((unused)),
struct dm_list *modules)
{
if (!str_list_add(mem, modules, _thin_pool_module)) {
log_error("String list allocation failed for thin_pool.");
return 0;
}
return 1;
}
# ifdef DMEVENTD # ifdef DMEVENTD
static const char *_get_thin_dso_path(struct cmd_context *cmd) static const char *_get_thin_dso_path(struct cmd_context *cmd)
{ {
@ -581,10 +594,10 @@ static int _thin_target_present(struct cmd_context *cmd,
const char *str; const char *str;
if (!_checked) { if (!_checked) {
_present = target_present(cmd, THIN_MODULE, 1); _present = target_present(cmd, _thin_pool_module, 1);
if (!target_version(THIN_MODULE, &maj, &min, &patchlevel)) { if (!target_version(_thin_pool_module, &maj, &min, &patchlevel)) {
log_error("Cannot read " THIN_MODULE " target version."); log_error("Cannot read %s target version.", _thin_pool_module);
return 0; return 0;
} }
@ -592,7 +605,8 @@ static int _thin_target_present(struct cmd_context *cmd,
if (maj >= _features[i].maj && min >= _features[i].min) if (maj >= _features[i].maj && min >= _features[i].min)
_attrs |= _features[i].thin_feature; _attrs |= _features[i].thin_feature;
else else
log_very_verbose("Target " THIN_MODULE " does not support %s.", log_very_verbose("Target %s does not support %s.",
_thin_pool_module,
_features[i].feature); _features[i].feature);
_checked = 1; _checked = 1;
@ -623,7 +637,8 @@ static int _thin_target_present(struct cmd_context *cmd,
for (i = 0; i < sizeof(_features)/sizeof(*_features); i++) for (i = 0; i < sizeof(_features)/sizeof(*_features); i++)
if ((_attrs & _features[i].thin_feature) && if ((_attrs & _features[i].thin_feature) &&
!(_feature_mask & _features[i].thin_feature)) !(_feature_mask & _features[i].thin_feature))
log_very_verbose("Target "THIN_MODULE " %s support disabled by %s", log_very_verbose("Target %s %s support disabled by %s",
_thin_pool_module,
_features[i].feature, _lvmconf); _features[i].feature, _lvmconf);
} }
*attributes = _attrs & _feature_mask; *attributes = _attrs & _feature_mask;
@ -634,11 +649,14 @@ static int _thin_target_present(struct cmd_context *cmd,
#endif #endif
static int _thin_modules_needed(struct dm_pool *mem, static int _thin_modules_needed(struct dm_pool *mem,
const struct lv_segment *seg __attribute__((unused)), const struct lv_segment *seg,
struct dm_list *modules) struct dm_list *modules)
{ {
if (!str_list_add(mem, modules, THIN_MODULE)) { if (!_thin_pool_modules_needed(mem, seg, modules))
log_error("thin string list allocation failed"); return_0;
if (!str_list_add(mem, modules, _thin_module)) {
log_error("String list allocation failed for thin.");
return 0; return 0;
} }
@ -665,7 +683,7 @@ static struct segtype_handler _thin_pool_ops = {
.target_unmonitor_events = _target_unregister_events, .target_unmonitor_events = _target_unregister_events,
# endif /* DMEVENTD */ # endif /* DMEVENTD */
#endif #endif
.modules_needed = _thin_modules_needed, .modules_needed = _thin_pool_modules_needed,
.destroy = _thin_destroy, .destroy = _thin_destroy,
}; };

2
test/shell/lvcreate-thin.sh
View File

@ -144,7 +144,7 @@ lvcreate --type snapshot $vg/lv1 --name lv6
lvcreate --type snapshot $vg/lv1 --name lv4 lvcreate --type snapshot $vg/lv1 --name lv4
lvcreate --type snapshot $vg/lv1 --name $vg/lv5 lvcreate --type snapshot $vg/lv1 --name $vg/lv5
check_lv_field_modules_ thin-pool lv1 snap_lv1 lv2 lv3 lv4 lv5 lv6 check_lv_field_modules_ thin-pool,thin lv1 snap_lv1 lv2 lv3 lv4 lv5 lv6
check vg_field $vg lv_count 8 check vg_field $vg lv_count 8
lvremove -ff $vg lvremove -ff $vg