shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-30 10:50:34 +03:00
Code Releases Activity

Move percent_t from struct lvcreate_params to struct lvcreate_cmdline_params.

Browse Source 
Create a new structure, lvcreate_cmdline_params, to store parameters only
relevant for the cmdline, not the library call to lvcreate.
Should be no functional change.


Author: Dave Wysochanski <dwysocha@redhat.com>
This commit is contained in:
Dave Wysochanski 2009-07-26 02:31:41 +00:00
parent 414bc9cc44
commit 77533a2090
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/lvcreate.c
View File

@ -18,6 +18,10 @@
#include <fcntl.h>
struct lvcreate_cmdline_params {
percent_t percent;
};
/* FIXME: refactor and reduce the size of this struct! */
struct lvcreate_params {
/* flags */
@ -46,7 +50,6 @@ struct lvcreate_params {
uint64_t size;
uint32_t voriginextents;
uint64_t voriginsize;
percent_t percent;
struct dm_list *pvh;
uint32_t permission;
@ -163,7 +166,8 @@ static int _lvcreate_name_params(struct lvcreate_params *lp,
* need the vg.
*/
static int _update_extents_params(struct volume_group *vg,
struct lvcreate_params *lp)
struct lvcreate_params *lp,
struct lvcreate_cmdline_params *lcp)
{
uint32_t pv_extent_count;
@ -178,7 +182,7 @@ static int _update_extents_params(struct volume_group *vg,
return_0;
/*
* Create the pv list before we parse lp->percent - might be
* Create the pv list before we parse lcp->percent - might be
* PERCENT_PVSs
*/
if (lp->pv_count) {
@ -188,7 +192,7 @@ static int _update_extents_params(struct volume_group *vg,
} else
lp->pvh = &vg->pvs;
switch(lp->percent) {
switch(lcp->percent) {
case PERCENT_VG:
lp->extents = lp->extents * vg->extent_count / 100;
break;
@ -215,6 +219,7 @@ static int _update_extents_params(struct volume_group *vg,
}
static int _read_size_params(struct lvcreate_params *lp,
struct lvcreate_cmdline_params *lcp,
struct cmd_context *cmd)
{
if (arg_count(cmd, extents_ARG) + arg_count(cmd, size_ARG) != 1) {
@ -228,7 +233,7 @@ static int _read_size_params(struct lvcreate_params *lp,
return 0;
}
lp->extents = arg_uint_value(cmd, extents_ARG, 0);
lp->percent = arg_percent_value(cmd, extents_ARG, PERCENT_NONE);
lcp->percent = arg_percent_value(cmd, extents_ARG, PERCENT_NONE);
}
/* Size returned in kilobyte units; held in sectors */
@ -238,7 +243,7 @@ static int _read_size_params(struct lvcreate_params *lp,
return 0;
}
lp->size = arg_uint64_value(cmd, size_ARG, UINT64_C(0));
lp->percent = PERCENT_NONE;
lcp->percent = PERCENT_NONE;
}
/* Size returned in kilobyte units; held in sectors */
@ -407,13 +412,16 @@ static int _read_mirror_params(struct lvcreate_params *lp,
return 1;
}
static int _lvcreate_params(struct lvcreate_params *lp, struct cmd_context *cmd,
static int _lvcreate_params(struct lvcreate_params *lp,
struct lvcreate_cmdline_params *lcp,
struct cmd_context *cmd,
int argc, char **argv)
{
int contiguous;
unsigned pagesize;
memset(lp, 0, sizeof(*lp));
memset(lcp, 0, sizeof(*lcp));
/*
* Check selected options are compatible and determine segtype
@ -508,7 +516,7 @@ static int _lvcreate_params(struct lvcreate_params *lp, struct cmd_context *cmd,
}
if (!_lvcreate_name_params(lp, cmd, &argc, &argv) ||
!_read_size_params(lp, cmd) ||
!_read_size_params(lp, lcp, cmd) ||
!_read_stripe_params(lp, cmd) ||
!_read_mirror_params(lp, cmd))
return_0;
@ -1006,11 +1014,12 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv)
{
int r = ECMD_PROCESSED;
struct lvcreate_params lp;
struct lvcreate_cmdline_params lcp;
struct volume_group *vg;
memset(&lp, 0, sizeof(lp));
if (!_lvcreate_params(&lp, cmd, argc, argv))
if (!_lvcreate_params(&lp, &lcp, cmd, argc, argv))
return EINVALID_CMD_LINE;
log_verbose("Finding volume group \"%s\"", lp.vg_name);
@ -1020,7 +1029,7 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv)
return ECMD_FAILED;
}
if (!_update_extents_params(vg, &lp))
if (!_update_extents_params(vg, &lp, &lcp))
return ECMD_FAILED;
if (!_lvcreate(vg, &lp))