1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00

lvconvert: allow implied cache pool convert

Just as with the implied thin pool convert when
given ambiguous command line options.
This commit is contained in:
David Teigland 2016-07-20 10:44:28 -05:00
parent 6ea250e2d0
commit b203d5e745

View File

@ -4201,7 +4201,9 @@ static int _convert_raid(struct cmd_context *cmd, struct logical_volume *lv,
if ((new_type && !strcmp(new_type, SEG_TYPE_NAME_THIN_POOL)) || arg_is_set(cmd, thinpool_ARG)) if ((new_type && !strcmp(new_type, SEG_TYPE_NAME_THIN_POOL)) || arg_is_set(cmd, thinpool_ARG))
return _convert_raid_thin_pool(cmd, lv, lp); return _convert_raid_thin_pool(cmd, lv, lp);
if (new_type && !strcmp(new_type, SEG_TYPE_NAME_CACHE_POOL)) /* Using --cachepool is ambiguous and not preferred. */
if ((new_type && !strcmp(new_type, SEG_TYPE_NAME_CACHE_POOL)) || arg_is_set(cmd, cachepool_ARG))
return _convert_raid_cache_pool(cmd, lv, lp); return _convert_raid_cache_pool(cmd, lv, lp);
if (new_type && new_segtype && segtype_is_raid(new_segtype)) if (new_type && new_segtype && segtype_is_raid(new_segtype))
@ -4261,7 +4263,9 @@ static int _convert_striped(struct cmd_context *cmd, struct logical_volume *lv,
if ((new_type && !strcmp(new_type, SEG_TYPE_NAME_THIN_POOL)) || arg_is_set(cmd, thinpool_ARG)) if ((new_type && !strcmp(new_type, SEG_TYPE_NAME_THIN_POOL)) || arg_is_set(cmd, thinpool_ARG))
return _convert_striped_thin_pool(cmd, lv, lp); return _convert_striped_thin_pool(cmd, lv, lp);
if (new_type && !strcmp(new_type, SEG_TYPE_NAME_CACHE_POOL)) /* Using --cachepool is ambiguous and not preferred. */
if ((new_type && !strcmp(new_type, SEG_TYPE_NAME_CACHE_POOL)) || arg_is_set(cmd, cachepool_ARG))
return _convert_striped_cache_pool(cmd, lv, lp); return _convert_striped_cache_pool(cmd, lv, lp);
if (new_type && !strcmp(new_type, SEG_TYPE_NAME_MIRROR)) if (new_type && !strcmp(new_type, SEG_TYPE_NAME_MIRROR))