public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2/tools toollib.c toollib.h vgcreate.c vgsp ...
@ 2009-11-01 20:03 wysochanski
0 siblings, 0 replies; 2+ messages in thread
From: wysochanski @ 2009-11-01 20:03 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2009-11-01 20:03:24
Modified files:
tools : toollib.c toollib.h vgcreate.c vgsplit.c
Log message:
Rename fill_vg_create_params to vgcreate_params_set_from_args.
Rename fill_vg_create_params to vgcreate_params_set_from_args and remove
vg_name parameter from function (caller must set before calling function).
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/toollib.c.diff?cvsroot=lvm2&r1=1.177&r2=1.178
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/toollib.h.diff?cvsroot=lvm2&r1=1.67&r2=1.68
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/vgcreate.c.diff?cvsroot=lvm2&r1=1.73&r2=1.74
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/vgsplit.c.diff?cvsroot=lvm2&r1=1.97&r2=1.98
--- LVM2/tools/toollib.c 2009/11/01 20:02:32 1.177
+++ LVM2/tools/toollib.c 2009/11/01 20:03:24 1.178
@@ -1204,16 +1204,16 @@
}
/*
- * Set members of struct vgcreate_params from cmdline.
+ * Set members of struct vgcreate_params from cmdline arguments.
* Do preliminary validation with arg_*() interface.
* Further, more generic validation is done in validate_vgcreate_params().
* This function is to remain in tools directory.
*/
-int fill_vg_create_params(struct cmd_context *cmd,
- char *vg_name, struct vgcreate_params *vp_new,
- struct vgcreate_params *vp_def)
+int vgcreate_params_set_from_args(struct cmd_context *cmd,
+ struct vgcreate_params *vp_new,
+ struct vgcreate_params *vp_def)
{
- vp_new->vg_name = skip_dev_dir(cmd, vg_name, NULL);
+ vp_new->vg_name = skip_dev_dir(cmd, vp_def->vg_name, NULL);
vp_new->max_lv = arg_uint_value(cmd, maxlogicalvolumes_ARG,
vp_def->max_lv);
vp_new->max_pv = arg_uint_value(cmd, maxphysicalvolumes_ARG,
--- LVM2/tools/toollib.h 2009/11/01 20:02:32 1.67
+++ LVM2/tools/toollib.h 2009/11/01 20:03:24 1.68
@@ -101,10 +101,9 @@
void vgcreate_params_set_defaults(struct vgcreate_params *vp_def,
struct volume_group *vg);
-int fill_vg_create_params(struct cmd_context *cmd,
- char *vg_name, struct vgcreate_params *vp_new,
- struct vgcreate_params *vp_def);
-
+int vgcreate_params_set_from_args(struct cmd_context *cmd,
+ struct vgcreate_params *vp_new,
+ struct vgcreate_params *vp_def);
int lv_refresh(struct cmd_context *cmd, struct logical_volume *lv);
int vg_refresh_visible(struct cmd_context *cmd, struct volume_group *vg);
void lv_spawn_background_polling(struct cmd_context *cmd,
--- LVM2/tools/vgcreate.c 2009/11/01 20:02:32 1.73
+++ LVM2/tools/vgcreate.c 2009/11/01 20:03:24 1.74
@@ -46,7 +46,8 @@
}
vgcreate_params_set_defaults(&vp_def, NULL);
- if (fill_vg_create_params(cmd, vg_name, &vp_new, &vp_def))
+ vp_def.vg_name = vg_name;
+ if (vgcreate_params_set_from_args(cmd, &vp_new, &vp_def))
return EINVALID_CMD_LINE;
if (validate_vg_create_params(cmd, &vp_new))
--- LVM2/tools/vgsplit.c 2009/11/01 20:02:32 1.97
+++ LVM2/tools/vgsplit.c 2009/11/01 20:03:24 1.98
@@ -367,7 +367,8 @@
goto_bad;
} else {
vgcreate_params_set_defaults(&vp_def, vg_from);
- if (fill_vg_create_params(cmd, vg_name_to, &vp_new, &vp_def)) {
+ vp_def.vg_name = vg_name_to;
+ if (vgcreate_params_set_from_args(cmd, &vp_new, &vp_def)) {
r = EINVALID_CMD_LINE;
goto_bad;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* LVM2/tools toollib.c toollib.h vgcreate.c vgsp ...
@ 2009-11-01 20:02 wysochanski
0 siblings, 0 replies; 2+ messages in thread
From: wysochanski @ 2009-11-01 20:02 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2009-11-01 20:02:32
Modified files:
tools : toollib.c toollib.h vgcreate.c vgsplit.c
Log message:
Add vgcreate_params_set_defaults().
Add function to set default vgcreate parameters based on existing VG or
internal defaults. Should be no functional change.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/toollib.c.diff?cvsroot=lvm2&r1=1.176&r2=1.177
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/toollib.h.diff?cvsroot=lvm2&r1=1.66&r2=1.67
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/vgcreate.c.diff?cvsroot=lvm2&r1=1.72&r2=1.73
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/vgsplit.c.diff?cvsroot=lvm2&r1=1.96&r2=1.97
--- LVM2/tools/toollib.c 2009/11/01 19:51:55 1.176
+++ LVM2/tools/toollib.c 2009/11/01 20:02:32 1.177
@@ -1183,6 +1183,26 @@
return rc;
}
+void vgcreate_params_set_defaults(struct vgcreate_params *vp_def,
+ struct volume_group *vg)
+{
+ if (vg) {
+ vp_def->vg_name = NULL;
+ vp_def->extent_size = vg->extent_size;
+ vp_def->max_pv = vg->max_pv;
+ vp_def->max_lv = vg->max_lv;
+ vp_def->alloc = vg->alloc;
+ vp_def->clustered = vg_is_clustered(vg);
+ } else {
+ vp_def->vg_name = NULL;
+ vp_def->extent_size = DEFAULT_EXTENT_SIZE * 2;
+ vp_def->max_pv = DEFAULT_MAX_PV;
+ vp_def->max_lv = DEFAULT_MAX_LV;
+ vp_def->alloc = DEFAULT_ALLOC_POLICY;
+ vp_def->clustered = DEFAULT_CLUSTERED;
+ }
+}
+
/*
* Set members of struct vgcreate_params from cmdline.
* Do preliminary validation with arg_*() interface.
--- LVM2/tools/toollib.h 2009/11/01 19:51:55 1.66
+++ LVM2/tools/toollib.h 2009/11/01 20:02:32 1.67
@@ -99,6 +99,8 @@
int apply_lvname_restrictions(const char *name);
int is_reserved_lvname(const char *name);
+void vgcreate_params_set_defaults(struct vgcreate_params *vp_def,
+ struct volume_group *vg);
int fill_vg_create_params(struct cmd_context *cmd,
char *vg_name, struct vgcreate_params *vp_new,
struct vgcreate_params *vp_def);
--- LVM2/tools/vgcreate.c 2009/11/01 19:51:55 1.72
+++ LVM2/tools/vgcreate.c 2009/11/01 20:02:32 1.73
@@ -45,12 +45,7 @@
return EINVALID_CMD_LINE;
}
- vp_def.vg_name = NULL;
- vp_def.extent_size = DEFAULT_EXTENT_SIZE * 2;
- vp_def.max_pv = DEFAULT_MAX_PV;
- vp_def.max_lv = DEFAULT_MAX_LV;
- vp_def.alloc = DEFAULT_ALLOC_POLICY;
- vp_def.clustered = DEFAULT_CLUSTERED;
+ vgcreate_params_set_defaults(&vp_def, NULL);
if (fill_vg_create_params(cmd, vg_name, &vp_new, &vp_def))
return EINVALID_CMD_LINE;
--- LVM2/tools/vgsplit.c 2009/10/31 17:43:57 1.96
+++ LVM2/tools/vgsplit.c 2009/11/01 20:02:32 1.97
@@ -366,13 +366,7 @@
if (!vgs_are_compatible(cmd, vg_from,vg_to))
goto_bad;
} else {
- vp_def.vg_name = NULL;
- vp_def.extent_size = vg_from->extent_size;
- vp_def.max_pv = vg_from->max_pv;
- vp_def.max_lv = vg_from->max_lv;
- vp_def.alloc = vg_from->alloc;
- vp_def.clustered = vg_is_clustered(vg_from);
-
+ vgcreate_params_set_defaults(&vp_def, vg_from);
if (fill_vg_create_params(cmd, vg_name_to, &vp_new, &vp_def)) {
r = EINVALID_CMD_LINE;
goto_bad;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-11-01 20:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-01 20:03 LVM2/tools toollib.c toollib.h vgcreate.c vgsp wysochanski
-- strict thread matches above, loose matches on Subject: below --
2009-11-01 20:02 wysochanski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).