From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26127 invoked by alias); 17 Nov 2010 19:15:12 -0000 Received: (qmail 26110 invoked by uid 9699); 17 Nov 2010 19:15:12 -0000 Date: Wed, 17 Nov 2010 19:15:00 -0000 Message-ID: <20101117191512.26108.qmail@sourceware.org> From: mornfall@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/lib/report columns.h properties.c propert ... Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2010-11/txt/msg00025.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mornfall@sourceware.org 2010-11-17 19:15:11 Modified files: lib/report : columns.h properties.c properties.h Log message: Add generic infrastructure to internal library to 'set' a property. Similar to 'get' property internal functions. Add specific 'set' function for vg_mda_copies. Signed-off-by: Dave Wysochanski Reviewed-by: Petr Rockai Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/columns.h.diff?cvsroot=lvm2&r1=1.45&r2=1.46 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.c.diff?cvsroot=lvm2&r1=1.22&r2=1.23 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.h.diff?cvsroot=lvm2&r1=1.5&r2=1.6 --- LVM2/lib/report/columns.h 2010/09/30 13:52:57 1.45 +++ LVM2/lib/report/columns.h 2010/11/17 19:15:10 1.46 @@ -121,7 +121,7 @@ FIELD(VGS, vg, NUM, "#VMdaUse", cmd, 8, vgmdasused, vg_mda_used_count, "Number of metadata areas in use on this VG.", 0) FIELD(VGS, vg, NUM, "VMdaFree", cmd, 9, vgmdafree, vg_mda_free, "Free metadata area space for this VG in current units.", 0) FIELD(VGS, vg, NUM, "VMdaSize", cmd, 9, vgmdasize, vg_mda_size, "Size of smallest metadata area for this VG in current units.", 0) -FIELD(VGS, vg, NUM, "#VMdaCps", cmd, 8, vgmdacopies, vg_mda_copies, "Target number of in use metadata areas in the VG.", 0) +FIELD(VGS, vg, NUM, "#VMdaCps", cmd, 8, vgmdacopies, vg_mda_copies, "Target number of in use metadata areas in the VG.", 1) FIELD(SEGS, seg, STR, "Type", list, 4, segtype, segtype, "Type of LV segment.", 0) FIELD(SEGS, seg, NUM, "#Str", area_count, 4, uint32, stripes, "Number of stripes or mirror legs.", 0) --- LVM2/lib/report/properties.c 2010/10/25 14:08:32 1.22 +++ LVM2/lib/report/properties.c 2010/11/17 19:15:11 1.23 @@ -35,6 +35,21 @@ #define GET_LV_NUM_PROPERTY_FN(NAME, VALUE) \ GET_NUM_PROPERTY_FN(NAME, VALUE, logical_volume, lv) +#define SET_NUM_PROPERTY_FN(NAME, SETFN, TYPE, VAR) \ +static int _ ## NAME ## _set (void *obj, struct lvm_property_type *prop) \ +{ \ + struct TYPE *VAR = (struct TYPE *)obj; \ +\ + SETFN(VAR, prop->value.integer); \ + return 1; \ +} +#define SET_VG_NUM_PROPERTY_FN(NAME, SETFN) \ + SET_NUM_PROPERTY_FN(NAME, SETFN, volume_group, vg) +#define SET_PV_NUM_PROPERTY_FN(NAME, SETFN) \ + SET_NUM_PROPERTY_FN(NAME, SETFN, physical_volume, pv) +#define SET_LV_NUM_PROPERTY_FN(NAME, SETFN) \ + SET_NUM_PROPERTY_FN(NAME, SETFN, logical_volume, lv) + #define GET_STR_PROPERTY_FN(NAME, VALUE, TYPE, VAR) \ static int _ ## NAME ## _get (const void *obj, struct lvm_property_type *prop) \ { \ @@ -184,7 +199,7 @@ GET_VG_NUM_PROPERTY_FN(vg_mda_size, (SECTOR_SIZE * vg_mda_size(vg))) #define _vg_mda_size_set _not_implemented_set GET_VG_NUM_PROPERTY_FN(vg_mda_copies, (vg_mda_copies(vg))) -#define _vg_mda_copies_set _not_implemented_set +SET_VG_NUM_PROPERTY_FN(vg_mda_copies, vg_set_mda_copies) /* LVSEG */ #define _segtype_get _not_implemented_get @@ -267,6 +282,42 @@ return 1; } +static int _set_property(void *obj, struct lvm_property_type *prop, + report_type_t type) +{ + struct lvm_property_type *p; + + p = _properties; + while (p->id[0]) { + if (!strcmp(p->id, prop->id)) + break; + p++; + } + if (!p->id[0]) { + log_errno(EINVAL, "Invalid property name %s", prop->id); + return 0; + } + if (!p->is_settable) { + log_errno(EINVAL, "Unable to set read-only property %s", + prop->id); + return 0; + } + if (!(p->type & type)) { + log_errno(EINVAL, "Property name %s does not match type %d", + prop->id, p->type); + return 0; + } + + if (p->is_string) + p->value.string = prop->value.string; + else + p->value.integer = prop->value.integer; + if (!p->set(obj, p)) { + return 0; + } + return 1; +} + int lv_get_property(const struct logical_volume *lv, struct lvm_property_type *prop) { @@ -284,3 +335,21 @@ { return _get_property(pv, prop, PVS | LABEL); } + +int lv_set_property(struct logical_volume *lv, + struct lvm_property_type *prop) +{ + return _set_property(lv, prop, LVS); +} + +int vg_set_property(struct volume_group *vg, + struct lvm_property_type *prop) +{ + return _set_property(vg, prop, VGS); +} + +int pv_set_property(struct physical_volume *pv, + struct lvm_property_type *prop) +{ + return _set_property(pv, prop, PVS | LABEL); +} --- LVM2/lib/report/properties.h 2010/10/25 14:08:32 1.5 +++ LVM2/lib/report/properties.h 2010/11/17 19:15:11 1.6 @@ -39,5 +39,11 @@ struct lvm_property_type *prop); int pv_get_property(const struct physical_volume *pv, struct lvm_property_type *prop); +int lv_set_property(struct logical_volume *lv, + struct lvm_property_type *prop); +int vg_set_property(struct volume_group *vg, + struct lvm_property_type *prop); +int pv_set_property(struct physical_volume *pv, + struct lvm_property_type *prop); #endif