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

Refactor lvcreate stripe parameter validation.

Browse Source
This commit is contained in:
Dave Wysochanski 2007-09-24 13:25:31 +00:00
parent 37ffe07697
commit 479921f1ef
2 changed files with 36 additions and 21 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.29 - Version 2.02.29 -
================================== ==================================
Refactor lvcreate stripe and mirror parameter validation.
All tools: print --help output to stdout, not stderr. All tools: print --help output to stdout, not stderr.
After a diagnostic, suggest --help, rather than printing all --help output. After a diagnostic, suggest --help, rather than printing all --help output.
Add %PVS extents option to lvresize, lvextend, and lvcreate. Add %PVS extents option to lvresize, lvextend, and lvcreate.

56
tools/lvcreate.c
View File

@ -174,28 +174,13 @@ static int _read_size_params(struct lvcreate_params *lp,
return 1; return 1;
} }
/* The stripe size is limited by the size of a uint32_t, but since the /*
* value given by the user is doubled, and the final result must be a * Generic stripe parameter checks.
* power of 2, we must divide UINT_MAX by four and add 1 (to round it * FIXME: Should eventually be moved into lvm library.
* up to the power of 2) */ */
static int _read_stripe_params(struct lvcreate_params *lp, static int _validate_stripe_params(struct cmd_context *cmd,
struct cmd_context *cmd, struct lvcreate_params *lp)
int *pargc __attribute((unused)))
{ {
if (arg_count(cmd, stripesize_ARG)) {
if (arg_sign_value(cmd, stripesize_ARG, 0) == SIGN_MINUS) {
log_error("Negative stripesize is invalid");
return 0;
}
/* Check to make sure we won't overflow lp->stripe_size */
if(arg_uint_value(cmd, stripesize_ARG, 0) > STRIPE_SIZE_LIMIT) {
log_error("Stripe size cannot be larger than %s",
display_size(cmd, (uint64_t) STRIPE_SIZE_LIMIT));
return 0;
}
lp->stripe_size = 2 * arg_uint_value(cmd, stripesize_ARG, 0);
}
if (lp->stripes == 1 && lp->stripe_size) { if (lp->stripes == 1 && lp->stripe_size) {
log_print("Ignoring stripesize argument with single stripe"); log_print("Ignoring stripesize argument with single stripe");
lp->stripe_size = 0; lp->stripe_size = 0;
@ -226,6 +211,35 @@ static int _read_stripe_params(struct lvcreate_params *lp,
return 1; return 1;
} }
/* The stripe size is limited by the size of a uint32_t, but since the
* value given by the user is doubled, and the final result must be a
* power of 2, we must divide UINT_MAX by four and add 1 (to round it
* up to the power of 2) */
static int _read_stripe_params(struct lvcreate_params *lp,
struct cmd_context *cmd,
int *pargc __attribute((unused)))
{
if (arg_count(cmd, stripesize_ARG)) {
if (arg_sign_value(cmd, stripesize_ARG, 0) == SIGN_MINUS) {
log_error("Negative stripesize is invalid");
return 0;
}
/* Check to make sure we won't overflow lp->stripe_size */
if(arg_uint_value(cmd, stripesize_ARG, 0) > STRIPE_SIZE_LIMIT) {
log_error("Stripe size cannot be larger than %s",
display_size(cmd, (uint64_t) STRIPE_SIZE_LIMIT));
return 0;
}
lp->stripe_size = 2 * arg_uint_value(cmd, stripesize_ARG, 0);
}
if (!_validate_stripe_params(cmd, lp))
return 0;
return 1;
}
static int _read_mirror_params(struct lvcreate_params *lp, static int _read_mirror_params(struct lvcreate_params *lp,
struct cmd_context *cmd, struct cmd_context *cmd,
int *pargc __attribute((unused))) int *pargc __attribute((unused)))