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

Misc: Change name of lvcreate_params field - s/create_thin_pool/create_pool/

Browse Source 
In preparation for other segment types that create and use "pools", we
s/create_thin_pool/create_pool/.  This way it is not awkward when creating
a cachepool, for example, to use "create_thin_pool".
This commit is contained in:
Jonathan Brassow 2014-01-22 10:30:55 -06:00
parent 5590448c32
commit 998af1a4fb
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/metadata/lv_manip.c
View File

@ -6227,7 +6227,7 @@ struct logical_volume *lv_create_single(struct volume_group *vg,
struct logical_volume *lv; struct logical_volume *lv;
/* Create thin pool first if necessary */ /* Create thin pool first if necessary */
if (lp->create_thin_pool) { if (lp->create_pool) {
if (!seg_is_thin_pool(lp) && if (!seg_is_thin_pool(lp) &&
!(lp->segtype = get_segtype_from_string(vg->cmd, "thin-pool"))) !(lp->segtype = get_segtype_from_string(vg->cmd, "thin-pool")))
return_0; return_0;

2
lib/metadata/metadata-exported.h
View File

@ -731,7 +731,7 @@ struct lvcreate_params {
/* flags */ /* flags */
int snapshot; /* snap */ int snapshot; /* snap */
int thin; /* thin */ int thin; /* thin */
int create_thin_pool; /* thin */ int create_pool; /* thin */
int zero; /* all */ int zero; /* all */
int wipe_signatures; /* all */ int wipe_signatures; /* all */
int major; /* all */ int major; /* all */

2
liblvm/lvm_lv.c
View File

@ -507,7 +507,7 @@ static int _lv_set_pool_params(struct lvcreate_params *lp,
lp->pool = pool; lp->pool = pool;
lp->create_thin_pool = 1; lp->create_pool = 1;
lp->segtype = get_segtype_from_string(vg->cmd, "thin-pool"); lp->segtype = get_segtype_from_string(vg->cmd, "thin-pool");
lp->stripes = 1; lp->stripes = 1;

36
tools/lvcreate.c
View File

@ -333,7 +333,7 @@ static int _update_extents_params(struct volume_group *vg,
lp->extents = lp->extents - size_rest; lp->extents = lp->extents - size_rest;
} }
if (lp->create_thin_pool) { if (lp->create_pool) {
if (!update_pool_params(vg, lp->target_attr, lp->passed_args, if (!update_pool_params(vg, lp->target_attr, lp->passed_args,
lp->extents, vg->extent_size, lp->extents, vg->extent_size,
&lp->thin_chunk_size_calc_policy, &lp->thin_chunk_size_calc_policy,
@ -392,9 +392,9 @@ static int _read_size_params(struct lvcreate_params *lp,
/* If size/extents given with thin, then we are creating a thin pool */ /* If size/extents given with thin, then we are creating a thin pool */
if (seg_is_thin(lp) && (arg_count(cmd, size_ARG) || arg_count(cmd, extents_ARG))) if (seg_is_thin(lp) && (arg_count(cmd, size_ARG) || arg_count(cmd, extents_ARG)))
lp->create_thin_pool = 1; lp->create_pool = 1;
if (!lp->create_thin_pool && arg_count(cmd, poolmetadatasize_ARG)) { if (!lp->create_pool && arg_count(cmd, poolmetadatasize_ARG)) {
log_error("--poolmetadatasize may only be specified when allocating the thin pool."); log_error("--poolmetadatasize may only be specified when allocating the thin pool.");
return 0; return 0;
} }
@ -665,7 +665,7 @@ static int _read_activation_params(struct lvcreate_params *lp, struct cmd_contex
/* Persistent minor */ /* Persistent minor */
if (arg_count(cmd, persistent_ARG)) { if (arg_count(cmd, persistent_ARG)) {
if (lp->create_thin_pool && !lp->thin) { if (lp->create_pool && !lp->thin) {
log_error("--persistent is not permitted when creating a thin pool device."); log_error("--persistent is not permitted when creating a thin pool device.");
return 0; return 0;
} }
@ -779,7 +779,7 @@ static int _lvcreate_params(struct lvcreate_params *lp,
log_error("Snapshots are incompatible with thin_pool segment_type."); log_error("Snapshots are incompatible with thin_pool segment_type.");
return 0; return 0;
} }
lp->create_thin_pool = 1; lp->create_pool = 1;
} }
if (seg_is_thin_volume(lp)) if (seg_is_thin_volume(lp))
@ -895,7 +895,7 @@ static int _lvcreate_params(struct lvcreate_params *lp,
if (!_lvcreate_name_params(lp, cmd, &argc, &argv) || if (!_lvcreate_name_params(lp, cmd, &argc, &argv) ||
!_read_size_params(lp, lcp, cmd) || !_read_size_params(lp, lcp, cmd) ||
!get_stripe_params(cmd, &lp->stripes, &lp->stripe_size) || !get_stripe_params(cmd, &lp->stripes, &lp->stripe_size) ||
(lp->create_thin_pool && (lp->create_pool &&
!get_pool_params(cmd, NULL, &lp->passed_args, !get_pool_params(cmd, NULL, &lp->passed_args,
&lp->thin_chunk_size_calc_policy, &lp->thin_chunk_size_calc_policy,
&lp->chunk_size, &lp->discards, &lp->chunk_size, &lp->discards,
@ -920,12 +920,12 @@ static int _lvcreate_params(struct lvcreate_params *lp,
if (!(lp->segtype = get_segtype_from_string(cmd, "snapshot"))) if (!(lp->segtype = get_segtype_from_string(cmd, "snapshot")))
return_0; return_0;
} else if (!lp->create_thin_pool && arg_count(cmd, chunksize_ARG)) { } else if (!lp->create_pool && arg_count(cmd, chunksize_ARG)) {
log_error("--chunksize is only available with snapshots and thin pools."); log_error("--chunksize is only available with snapshots and thin pools.");
return 0; return 0;
} }
if (lp->create_thin_pool) { if (lp->create_pool) {
/* TODO: add lvm.conf default y|n */ /* TODO: add lvm.conf default y|n */
lp->poolmetadataspare = arg_int_value(cmd, poolmetadataspare_ARG, lp->poolmetadataspare = arg_int_value(cmd, poolmetadataspare_ARG,
DEFAULT_POOL_METADATA_SPARE); DEFAULT_POOL_METADATA_SPARE);
@ -974,7 +974,7 @@ static int _check_thin_parameters(struct volume_group *vg, struct lvcreate_param
struct lv_list *lvl; struct lv_list *lvl;
unsigned i; unsigned i;
if (!lp->thin && !lp->create_thin_pool && !lp->snapshot) { if (!lp->thin && !lp->create_pool && !lp->snapshot) {
log_error("Please specify device size(s)."); log_error("Please specify device size(s).");
return 0; return 0;
} }
@ -984,7 +984,7 @@ static int _check_thin_parameters(struct volume_group *vg, struct lvcreate_param
return 0; return 0;
} }
if (!lp->create_thin_pool) { if (!lp->create_pool) {
static const int _argname[] = { static const int _argname[] = {
alloc_ARG, alloc_ARG,
chunksize_ARG, chunksize_ARG,
@ -1060,14 +1060,14 @@ static int _validate_internal_thin_processing(const struct lvcreate_params *lp)
/* /*
The final state should be one of: The final state should be one of:
thin create_thin_pool snapshot origin pool thin create_pool snapshot origin pool
1 1 0 0 y/n - create new pool and a thin LV in it 1 1 0 0 y/n - create new pool and a thin LV in it
1 0 0 0 y - create new thin LV in existing pool 1 0 0 0 y - create new thin LV in existing pool
0 1 0 0 y/n - create new pool only 0 1 0 0 y/n - create new pool only
1 0 1 1 y - create thin snapshot of existing thin LV 1 0 1 1 y - create thin snapshot of existing thin LV
*/ */
if (!lp->create_thin_pool && !lp->pool) { if (!lp->create_pool && !lp->pool) {
log_error(INTERNAL_ERROR "--thinpool not identified."); log_error(INTERNAL_ERROR "--thinpool not identified.");
r = 0; r = 0;
} }
@ -1077,7 +1077,7 @@ static int _validate_internal_thin_processing(const struct lvcreate_params *lp)
r = 0; r = 0;
} }
if (!lp->thin && !lp->create_thin_pool && !lp->snapshot) { if (!lp->thin && !lp->create_pool && !lp->snapshot) {
log_error(INTERNAL_ERROR "Failed to identify what type of thin target to use."); log_error(INTERNAL_ERROR "Failed to identify what type of thin target to use.");
r = 0; r = 0;
} }
@ -1126,7 +1126,7 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv)
if (seg_is_thin(&lp) && !_validate_internal_thin_processing(&lp)) if (seg_is_thin(&lp) && !_validate_internal_thin_processing(&lp))
goto_out; goto_out;
if (lp.create_thin_pool) { if (lp.create_pool) {
if (!handle_pool_metadata_spare(vg, lp.poolmetadataextents, if (!handle_pool_metadata_spare(vg, lp.poolmetadataextents,
lp.pvh, lp.poolmetadataspare)) lp.pvh, lp.poolmetadataspare))
goto_out; goto_out;