public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2/lib metadata/lv.c metadata/lv.h report/pr ...
@ 2010-10-12 16:11 wysochanski
0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2010-10-12 16:11 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-10-12 16:11:48
Modified files:
lib/metadata : lv.c lv.h
lib/report : properties.c report.c
Log message:
Refactor and add code for (lv) 'origin_size' get function.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Reviewed-By: Petr Rockai <prockai@redhat.com>
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.c.diff?cvsroot=lvm2&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.h.diff?cvsroot=lvm2&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.c.diff?cvsroot=lvm2&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/report.c.diff?cvsroot=lvm2&r1=1.132&r2=1.133
--- LVM2/lib/metadata/lv.c 2010/10/12 16:11:34 1.7
+++ LVM2/lib/metadata/lv.c 2010/10/12 16:11:48 1.8
@@ -18,6 +18,15 @@
#include "activate.h"
#include "toolcontext.h"
+uint64_t lv_origin_size(const struct logical_volume *lv)
+{
+ if (lv_is_cow(lv))
+ return (uint64_t) find_cow(lv)->len * lv->vg->extent_size;
+ if (lv_is_origin(lv))
+ return lv->size;
+ return 0;
+}
+
char *lv_path_dup(struct dm_pool *mem, const struct logical_volume *lv)
{
char *repstr;
--- LVM2/lib/metadata/lv.h 2010/10/12 16:11:34 1.6
+++ LVM2/lib/metadata/lv.h 2010/10/12 16:11:48 1.7
@@ -53,5 +53,6 @@
char *lv_uuid_dup(const struct logical_volume *lv);
char *lv_tags_dup(const struct logical_volume *lv);
char *lv_path_dup(struct dm_pool *mem, const struct logical_volume *lv);
+uint64_t lv_origin_size(const struct logical_volume *lv);
#endif
--- LVM2/lib/report/properties.c 2010/10/12 16:11:34 1.10
+++ LVM2/lib/report/properties.c 2010/10/12 16:11:48 1.11
@@ -123,7 +123,7 @@
#define _seg_count_set _not_implemented_set
#define _origin_get _not_implemented_get
#define _origin_set _not_implemented_set
-#define _origin_size_get _not_implemented_get
+GET_LV_NUM_PROPERTY_FN(origin_size, lv_origin_size(lv))
#define _origin_size_set _not_implemented_set
#define _snap_percent_get _not_implemented_get
#define _snap_percent_set _not_implemented_set
--- LVM2/lib/report/report.c 2010/10/12 16:11:34 1.132
+++ LVM2/lib/report/report.c 2010/10/12 16:11:48 1.133
@@ -570,12 +570,7 @@
const struct logical_volume *lv = (const struct logical_volume *) data;
uint64_t size;
- if (lv_is_cow(lv))
- size = (uint64_t) find_cow(lv)->len * lv->vg->extent_size;
- else if (lv_is_origin(lv))
- size = lv->size;
- else
- size = UINT64_C(0);
+ size = lv_origin_size(lv);
return _size64_disp(rh, mem, field, &size, private);
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* LVM2/lib metadata/lv.c metadata/lv.h report/pr ...
@ 2010-11-17 20:08 mornfall
0 siblings, 0 replies; 11+ messages in thread
From: mornfall @ 2010-11-17 20:08 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2010-11-17 20:08:14
Modified files:
lib/metadata : lv.c lv.h
lib/report : properties.c properties.h report.c
Log message:
Add the macro and specific 'get' functions for lvsegs.
Signed-off-by: Dave Wysochanski <wysochanski@pobox.com>
Reviewed-by: Petr Rockai <prockai@redhat.com>
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.c.diff?cvsroot=lvm2&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.h.diff?cvsroot=lvm2&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.c.diff?cvsroot=lvm2&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.h.diff?cvsroot=lvm2&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/report.c.diff?cvsroot=lvm2&r1=1.139&r2=1.140
--- LVM2/lib/metadata/lv.c 2010/10/25 13:54:29 1.18
+++ LVM2/lib/metadata/lv.c 2010/11/17 20:08:14 1.19
@@ -21,6 +21,41 @@
#include "segtype.h"
#include "str_list.h"
+char *lvseg_tags_dup(const struct lv_segment *seg)
+{
+ return tags_format_and_copy(seg->lv->vg->vgmem, &seg->tags);
+}
+
+char *lvseg_segtype_dup(const struct lv_segment *seg)
+{
+ if (seg->area_count == 1) {
+ return (char *)"linear";
+ }
+
+ return dm_pool_strdup(seg->lv->vg->vgmem, seg->segtype->ops->name(seg));
+}
+
+uint64_t lvseg_chunksize(const struct lv_segment *seg)
+{
+ uint64_t size;
+
+ if (lv_is_cow(seg->lv))
+ size = (uint64_t) find_cow(seg->lv)->chunk_size;
+ else
+ size = UINT64_C(0);
+ return size;
+}
+
+uint64_t lvseg_start(const struct lv_segment *seg)
+{
+ return (uint64_t) seg->le * seg->lv->vg->extent_size;
+}
+
+uint64_t lvseg_size(const struct lv_segment *seg)
+{
+ return (uint64_t) seg->len * seg->lv->vg->extent_size;
+}
+
uint32_t lv_kernel_read_ahead(const struct logical_volume *lv)
{
struct lvinfo info;
--- LVM2/lib/metadata/lv.h 2010/10/25 12:01:59 1.16
+++ LVM2/lib/metadata/lv.h 2010/11/17 20:08:14 1.17
@@ -63,5 +63,10 @@
char *lv_name_dup(struct dm_pool *mem, const struct logical_volume *lv);
char *lv_origin_dup(struct dm_pool *mem, const struct logical_volume *lv);
uint32_t lv_kernel_read_ahead(const struct logical_volume *lv);
+uint64_t lvseg_start(const struct lv_segment *seg);
+uint64_t lvseg_size(const struct lv_segment *seg);
+uint64_t lvseg_chunksize(const struct lv_segment *seg);
+char *lvseg_segtype_dup(const struct lv_segment *seg);
+char *lvseg_tags_dup(const struct lv_segment *seg);
#endif /* _LVM_LV_H */
--- LVM2/lib/report/properties.c 2010/11/17 19:15:11 1.23
+++ LVM2/lib/report/properties.c 2010/11/17 20:08:14 1.24
@@ -34,6 +34,8 @@
GET_NUM_PROPERTY_FN(NAME, VALUE, physical_volume, pv)
#define GET_LV_NUM_PROPERTY_FN(NAME, VALUE) \
GET_NUM_PROPERTY_FN(NAME, VALUE, logical_volume, lv)
+#define GET_LVSEG_NUM_PROPERTY_FN(NAME, VALUE) \
+ GET_NUM_PROPERTY_FN(NAME, VALUE, lv_segment, lvseg)
#define SET_NUM_PROPERTY_FN(NAME, SETFN, TYPE, VAR) \
static int _ ## NAME ## _set (void *obj, struct lvm_property_type *prop) \
@@ -64,6 +66,8 @@
GET_STR_PROPERTY_FN(NAME, VALUE, physical_volume, pv)
#define GET_LV_STR_PROPERTY_FN(NAME, VALUE) \
GET_STR_PROPERTY_FN(NAME, VALUE, logical_volume, lv)
+#define GET_LVSEG_STR_PROPERTY_FN(NAME, VALUE) \
+ GET_STR_PROPERTY_FN(NAME, VALUE, lv_segment, lvseg)
static int _not_implemented_get(const void *obj, struct lvm_property_type *prop)
{
@@ -202,29 +206,29 @@
SET_VG_NUM_PROPERTY_FN(vg_mda_copies, vg_set_mda_copies)
/* LVSEG */
-#define _segtype_get _not_implemented_get
+GET_LVSEG_STR_PROPERTY_FN(segtype, lvseg_segtype_dup(lvseg))
#define _segtype_set _not_implemented_set
-#define _stripes_get _not_implemented_get
+GET_LVSEG_NUM_PROPERTY_FN(stripes, lvseg->area_count)
#define _stripes_set _not_implemented_set
-#define _stripesize_get _not_implemented_get
+GET_LVSEG_NUM_PROPERTY_FN(stripesize, lvseg->stripe_size)
#define _stripesize_set _not_implemented_set
-#define _stripe_size_get _not_implemented_get
+GET_LVSEG_NUM_PROPERTY_FN(stripe_size, lvseg->stripe_size)
#define _stripe_size_set _not_implemented_set
-#define _regionsize_get _not_implemented_get
+GET_LVSEG_NUM_PROPERTY_FN(regionsize, lvseg->region_size)
#define _regionsize_set _not_implemented_set
-#define _region_size_get _not_implemented_get
+GET_LVSEG_NUM_PROPERTY_FN(region_size, lvseg->region_size)
#define _region_size_set _not_implemented_set
-#define _chunksize_get _not_implemented_get
+GET_LVSEG_NUM_PROPERTY_FN(chunksize, lvseg_chunksize(lvseg))
#define _chunksize_set _not_implemented_set
-#define _chunk_size_get _not_implemented_get
+GET_LVSEG_NUM_PROPERTY_FN(chunk_size, lvseg_chunksize(lvseg))
#define _chunk_size_set _not_implemented_set
-#define _seg_start_get _not_implemented_get
+GET_LVSEG_NUM_PROPERTY_FN(seg_start, lvseg_start(lvseg))
#define _seg_start_set _not_implemented_set
-#define _seg_start_pe_get _not_implemented_get
+GET_LVSEG_NUM_PROPERTY_FN(seg_start_pe, lvseg->le)
#define _seg_start_pe_set _not_implemented_set
-#define _seg_size_get _not_implemented_get
+GET_LVSEG_NUM_PROPERTY_FN(seg_size, lvseg_size(lvseg))
#define _seg_size_set _not_implemented_set
-#define _seg_tags_get _not_implemented_get
+GET_LVSEG_STR_PROPERTY_FN(seg_tags, lvseg_tags_dup(lvseg))
#define _seg_tags_set _not_implemented_set
#define _seg_pe_ranges_get _not_implemented_get
#define _seg_pe_ranges_set _not_implemented_set
@@ -318,6 +322,12 @@
return 1;
}
+int lvseg_get_property(const struct lv_segment *lvseg,
+ struct lvm_property_type *prop)
+{
+ return _get_property(lvseg, prop, SEGS);
+}
+
int lv_get_property(const struct logical_volume *lv,
struct lvm_property_type *prop)
{
--- LVM2/lib/report/properties.h 2010/11/17 19:50:15 1.7
+++ LVM2/lib/report/properties.h 2010/11/17 20:08:14 1.8
@@ -33,6 +33,8 @@
int (*set) (void *obj, struct lvm_property_type *prop);
};
+int lvseg_get_property(const struct lv_segment *lvseg,
+ struct lvm_property_type *prop);
int lv_get_property(const struct logical_volume *lv,
struct lvm_property_type *prop);
int vg_get_property(const struct volume_group *vg,
--- LVM2/lib/report/report.c 2010/10/21 14:49:31 1.139
+++ LVM2/lib/report/report.c 2010/11/17 20:08:14 1.140
@@ -279,12 +279,9 @@
{
const struct lv_segment *seg = (const struct lv_segment *) data;
- if (seg->area_count == 1) {
- dm_report_field_set_value(field, "linear", NULL);
- return 1;
- }
-
- dm_report_field_set_value(field, seg->segtype->ops->name(seg), NULL);
+ char *name;
+ name = lvseg_segtype_dup(seg);
+ dm_report_field_set_value(field, name, NULL);
return 1;
}
@@ -496,7 +493,7 @@
const struct lv_segment *seg = (const struct lv_segment *) data;
uint64_t start;
- start = (uint64_t) seg->le * seg->lv->vg->extent_size;
+ start = lvseg_start(seg);
return _size64_disp(rh, mem, field, &start, private);
}
@@ -519,7 +516,7 @@
const struct lv_segment *seg = (const struct lv_segment *) data;
uint64_t size;
- size = (uint64_t) seg->len * seg->lv->vg->extent_size;
+ size = lvseg_size(seg);
return _size64_disp(rh, mem, field, &size, private);
}
@@ -531,10 +528,7 @@
const struct lv_segment *seg = (const struct lv_segment *) data;
uint64_t size;
- if (lv_is_cow(seg->lv))
- size = (uint64_t) find_cow(seg->lv)->chunk_size;
- else
- size = UINT64_C(0);
+ size = lvseg_chunksize(seg);
return _size64_disp(rh, mem, field, &size, private);
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* LVM2/lib metadata/lv.c metadata/lv.h report/pr ...
@ 2010-10-21 14:49 wysochanski
0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2010-10-21 14:49 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-10-21 14:49:11
Modified files:
lib/metadata : lv.c lv.h
lib/report : properties.c
Log message:
Refactor and add code for (lv) 'lv_name' get function.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.c.diff?cvsroot=lvm2&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.h.diff?cvsroot=lvm2&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.c.diff?cvsroot=lvm2&r1=1.16&r2=1.17
--- LVM2/lib/metadata/lv.c 2010/10/12 17:09:23 1.14
+++ LVM2/lib/metadata/lv.c 2010/10/21 14:49:10 1.15
@@ -20,6 +20,11 @@
#include "segtype.h"
#include "str_list.h"
+char *lv_name_dup(struct dm_pool *mem, const struct logical_volume *lv)
+{
+ return dm_pool_strdup(mem, lv->name);
+}
+
char *lv_modules_dup(struct dm_pool *mem, const struct logical_volume *lv)
{
struct dm_list *modules;
--- LVM2/lib/metadata/lv.h 2010/10/12 16:13:06 1.12
+++ LVM2/lib/metadata/lv.h 2010/10/21 14:49:10 1.13
@@ -60,5 +60,6 @@
int lv_kernel_minor(const struct logical_volume *lv);
char *lv_mirror_log_dup(struct dm_pool *mem, const struct logical_volume *lv);
char *lv_modules_dup(struct dm_pool *mem, const struct logical_volume *lv);
+char *lv_name_dup(struct dm_pool *mem, const struct logical_volume *lv);
#endif
--- LVM2/lib/report/properties.c 2010/10/12 16:13:07 1.16
+++ LVM2/lib/report/properties.c 2010/10/21 14:49:10 1.17
@@ -99,7 +99,7 @@
/* LV */
GET_LV_STR_PROPERTY_FN(lv_uuid, lv_uuid_dup(lv))
#define _lv_uuid_set _not_implemented_set
-#define _lv_name_get _not_implemented_get
+GET_LV_STR_PROPERTY_FN(lv_name, lv_name_dup(lv->vg->vgmem, lv))
#define _lv_name_set _not_implemented_set
GET_LV_STR_PROPERTY_FN(lv_path, lv_path_dup(lv->vg->vgmem, lv))
#define _lv_path_set _not_implemented_set
^ permalink raw reply [flat|nested] 11+ messages in thread
* LVM2/lib metadata/lv.c metadata/lv.h report/pr ...
@ 2010-10-21 14:49 wysochanski
0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2010-10-21 14:49 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-10-21 14:49:32
Modified files:
lib/metadata : lv.c lv.h
lib/report : properties.c report.c
Log message:
Add lv_read_ahead and lv_kernel_read_ahead 'get' functions.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.c.diff?cvsroot=lvm2&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.h.diff?cvsroot=lvm2&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.c.diff?cvsroot=lvm2&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/report.c.diff?cvsroot=lvm2&r1=1.138&r2=1.139
--- LVM2/lib/metadata/lv.c 2010/10/21 14:49:20 1.16
+++ LVM2/lib/metadata/lv.c 2010/10/21 14:49:31 1.17
@@ -20,6 +20,15 @@
#include "segtype.h"
#include "str_list.h"
+uint32_t lv_kernel_read_ahead(const struct logical_volume *lv)
+{
+ struct lvinfo info;
+
+ if (!lv_info(lv->vg->cmd, lv, 0, &info, 0, 1) || !info.exists)
+ return UINT32_MAX;
+ return info.read_ahead;
+}
+
char *lv_origin_dup(struct dm_pool *mem, const struct logical_volume *lv)
{
if (lv_is_cow(lv))
--- LVM2/lib/metadata/lv.h 2010/10/21 14:49:20 1.14
+++ LVM2/lib/metadata/lv.h 2010/10/21 14:49:31 1.15
@@ -62,5 +62,6 @@
char *lv_modules_dup(struct dm_pool *mem, const struct logical_volume *lv);
char *lv_name_dup(struct dm_pool *mem, const struct logical_volume *lv);
char *lv_origin_dup(struct dm_pool *mem, const struct logical_volume *lv);
+uint32_t lv_kernel_read_ahead(const struct logical_volume *lv);
#endif
--- LVM2/lib/report/properties.c 2010/10/21 14:49:20 1.18
+++ LVM2/lib/report/properties.c 2010/10/21 14:49:31 1.19
@@ -109,13 +109,13 @@
#define _lv_major_set _not_implemented_set
GET_LV_NUM_PROPERTY_FN(lv_minor, lv->minor)
#define _lv_minor_set _not_implemented_set
-#define _lv_read_ahead_get _not_implemented_get
+GET_LV_NUM_PROPERTY_FN(lv_read_ahead, lv->read_ahead * SECTOR_SIZE)
#define _lv_read_ahead_set _not_implemented_set
GET_LV_NUM_PROPERTY_FN(lv_kernel_major, lv_kernel_major(lv))
#define _lv_kernel_major_set _not_implemented_set
GET_LV_NUM_PROPERTY_FN(lv_kernel_minor, lv_kernel_minor(lv))
#define _lv_kernel_minor_set _not_implemented_set
-#define _lv_kernel_read_ahead_get _not_implemented_get
+GET_LV_NUM_PROPERTY_FN(lv_kernel_read_ahead, lv_kernel_read_ahead(lv) * SECTOR_SIZE)
#define _lv_kernel_read_ahead_set _not_implemented_set
GET_LV_NUM_PROPERTY_FN(lv_size, lv->size * SECTOR_SIZE)
#define _lv_size_set _not_implemented_set
--- LVM2/lib/report/report.c 2010/10/12 16:13:07 1.138
+++ LVM2/lib/report/report.c 2010/10/21 14:49:31 1.139
@@ -469,12 +469,12 @@
void *private)
{
const struct logical_volume *lv = (const struct logical_volume *) data;
- struct lvinfo info;
+ uint32_t read_ahead;
- if (!lv_info(lv->vg->cmd, lv, 0, &info, 0, 1) || !info.exists)
+ if ((read_ahead = lv_kernel_read_ahead(lv)) == UINT32_MAX)
return dm_report_field_int32(rh, field, &_minusone32);
- return _size32_disp(rh, mem, field, &info.read_ahead, private);
+ return _size32_disp(rh, mem, field, &read_ahead, private);
}
static int _vgsize_disp(struct dm_report *rh, struct dm_pool *mem,
^ permalink raw reply [flat|nested] 11+ messages in thread
* LVM2/lib metadata/lv.c metadata/lv.h report/pr ...
@ 2010-10-21 14:49 wysochanski
0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2010-10-21 14:49 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-10-21 14:49:20
Modified files:
lib/metadata : lv.c lv.h
lib/report : properties.c
Log message:
Refactor and add code for (lv) 'lv_origin' get function.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.c.diff?cvsroot=lvm2&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.h.diff?cvsroot=lvm2&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.c.diff?cvsroot=lvm2&r1=1.17&r2=1.18
--- LVM2/lib/metadata/lv.c 2010/10/21 14:49:10 1.15
+++ LVM2/lib/metadata/lv.c 2010/10/21 14:49:20 1.16
@@ -20,6 +20,13 @@
#include "segtype.h"
#include "str_list.h"
+char *lv_origin_dup(struct dm_pool *mem, const struct logical_volume *lv)
+{
+ if (lv_is_cow(lv))
+ return lv_name_dup(mem, origin_from_cow(lv));
+ return NULL;
+}
+
char *lv_name_dup(struct dm_pool *mem, const struct logical_volume *lv)
{
return dm_pool_strdup(mem, lv->name);
--- LVM2/lib/metadata/lv.h 2010/10/21 14:49:10 1.13
+++ LVM2/lib/metadata/lv.h 2010/10/21 14:49:20 1.14
@@ -61,5 +61,6 @@
char *lv_mirror_log_dup(struct dm_pool *mem, const struct logical_volume *lv);
char *lv_modules_dup(struct dm_pool *mem, const struct logical_volume *lv);
char *lv_name_dup(struct dm_pool *mem, const struct logical_volume *lv);
+char *lv_origin_dup(struct dm_pool *mem, const struct logical_volume *lv);
#endif
--- LVM2/lib/report/properties.c 2010/10/21 14:49:10 1.17
+++ LVM2/lib/report/properties.c 2010/10/21 14:49:20 1.18
@@ -121,7 +121,7 @@
#define _lv_size_set _not_implemented_set
GET_LV_NUM_PROPERTY_FN(seg_count, dm_list_size(&lv->segments))
#define _seg_count_set _not_implemented_set
-#define _origin_get _not_implemented_get
+GET_LV_STR_PROPERTY_FN(origin, lv_origin_dup(lv->vg->vgmem, lv))
#define _origin_set _not_implemented_set
GET_LV_NUM_PROPERTY_FN(origin_size, lv_origin_size(lv))
#define _origin_size_set _not_implemented_set
^ permalink raw reply [flat|nested] 11+ messages in thread
* LVM2/lib metadata/lv.c metadata/lv.h report/pr ...
@ 2010-10-12 16:13 wysochanski
0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2010-10-12 16:13 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-10-12 16:13:07
Modified files:
lib/metadata : lv.c lv.h
lib/report : properties.c report.c
Log message:
Refactor and add code for (lv) 'modules' get function.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.c.diff?cvsroot=lvm2&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.h.diff?cvsroot=lvm2&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.c.diff?cvsroot=lvm2&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/report.c.diff?cvsroot=lvm2&r1=1.137&r2=1.138
--- LVM2/lib/metadata/lv.c 2010/10/12 16:12:50 1.12
+++ LVM2/lib/metadata/lv.c 2010/10/12 16:13:06 1.13
@@ -18,6 +18,21 @@
#include "activate.h"
#include "toolcontext.h"
#include "segtype.h"
+#include "str_list.h"
+
+char *lv_modules_dup(struct dm_pool *mem, const struct logical_volume *lv)
+{
+ struct dm_list *modules;
+
+ if (!(modules = str_list_create(mem))) {
+ log_error("modules str_list allocation failed");
+ return NULL;
+ }
+
+ if (!list_lv_modules(mem, lv, modules))
+ return_NULL;
+ return tags_format_and_copy(lv->vg->vgmem, modules);
+}
char *lv_mirror_log_dup(struct dm_pool *mem, const struct logical_volume *lv)
{
--- LVM2/lib/metadata/lv.h 2010/10/12 16:12:50 1.11
+++ LVM2/lib/metadata/lv.h 2010/10/12 16:13:06 1.12
@@ -59,5 +59,6 @@
int lv_kernel_major(const struct logical_volume *lv);
int lv_kernel_minor(const struct logical_volume *lv);
char *lv_mirror_log_dup(struct dm_pool *mem, const struct logical_volume *lv);
+char *lv_modules_dup(struct dm_pool *mem, const struct logical_volume *lv);
#endif
--- LVM2/lib/report/properties.c 2010/10/12 16:12:50 1.15
+++ LVM2/lib/report/properties.c 2010/10/12 16:13:07 1.16
@@ -137,7 +137,7 @@
#define _lv_tags_set _not_implemented_set
GET_LV_STR_PROPERTY_FN(mirror_log, lv_mirror_log_dup(lv->vg->vgmem, lv))
#define _mirror_log_set _not_implemented_set
-#define _modules_get _not_implemented_get
+GET_LV_STR_PROPERTY_FN(modules, lv_modules_dup(lv->vg->vgmem, lv))
#define _modules_set _not_implemented_set
/* VG */
--- LVM2/lib/report/report.c 2010/10/12 16:12:50 1.137
+++ LVM2/lib/report/report.c 2010/10/12 16:13:07 1.138
@@ -165,17 +165,13 @@
const void *data, void *private)
{
const struct logical_volume *lv = (const struct logical_volume *) data;
- struct dm_list *modules;
+ char *modules_str;
- if (!(modules = str_list_create(mem))) {
- log_error("modules str_list allocation failed");
+ if (!(modules_str = lv_modules_dup(mem, lv)))
return 0;
- }
-
- if (!list_lv_modules(mem, lv, modules))
- return_0;
- return _tags_disp(rh, mem, field, modules, private);
+ dm_report_field_set_value(field, modules_str, NULL);
+ return 1;
}
static int _vgfmt_disp(struct dm_report *rh, struct dm_pool *mem,
^ permalink raw reply [flat|nested] 11+ messages in thread
* LVM2/lib metadata/lv.c metadata/lv.h report/pr ...
@ 2010-10-12 16:12 wysochanski
0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2010-10-12 16:12 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-10-12 16:12:03
Modified files:
lib/metadata : lv.c lv.h
lib/report : properties.c report.c
Log message:
Refactor and add code for (lv) 'move_pv' get function.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Reviewed-By: Petr Rockai <prockai@redhat.com>
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.c.diff?cvsroot=lvm2&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.h.diff?cvsroot=lvm2&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.c.diff?cvsroot=lvm2&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/report.c.diff?cvsroot=lvm2&r1=1.133&r2=1.134
--- LVM2/lib/metadata/lv.c 2010/10/12 16:11:48 1.8
+++ LVM2/lib/metadata/lv.c 2010/10/12 16:12:02 1.9
@@ -18,6 +18,17 @@
#include "activate.h"
#include "toolcontext.h"
+char *lv_move_pv_dup(struct dm_pool *mem, const struct logical_volume *lv)
+{
+ struct lv_segment *seg;
+
+ dm_list_iterate_items(seg, &lv->segments) {
+ if (seg->status & PVMOVE)
+ return dm_pool_strdup(mem, dev_name(seg_dev(seg, 0)));
+ }
+ return NULL;
+}
+
uint64_t lv_origin_size(const struct logical_volume *lv)
{
if (lv_is_cow(lv))
--- LVM2/lib/metadata/lv.h 2010/10/12 16:11:48 1.7
+++ LVM2/lib/metadata/lv.h 2010/10/12 16:12:02 1.8
@@ -54,5 +54,6 @@
char *lv_tags_dup(const struct logical_volume *lv);
char *lv_path_dup(struct dm_pool *mem, const struct logical_volume *lv);
uint64_t lv_origin_size(const struct logical_volume *lv);
+char *lv_move_pv_dup(struct dm_pool *mem, const struct logical_volume *lv);
#endif
--- LVM2/lib/report/properties.c 2010/10/12 16:11:48 1.11
+++ LVM2/lib/report/properties.c 2010/10/12 16:12:02 1.12
@@ -129,7 +129,7 @@
#define _snap_percent_set _not_implemented_set
#define _copy_percent_get _not_implemented_get
#define _copy_percent_set _not_implemented_set
-#define _move_pv_get _not_implemented_get
+GET_LV_STR_PROPERTY_FN(move_pv, lv_move_pv_dup(lv->vg->vgmem, lv))
#define _move_pv_set _not_implemented_set
#define _convert_lv_get _not_implemented_get
#define _convert_lv_set _not_implemented_set
--- LVM2/lib/report/report.c 2010/10/12 16:11:48 1.133
+++ LVM2/lib/report/report.c 2010/10/12 16:12:02 1.134
@@ -378,16 +378,11 @@
{
const struct logical_volume *lv = (const struct logical_volume *) data;
const char *name;
- struct lv_segment *seg;
- dm_list_iterate_items(seg, &lv->segments) {
- if (!(seg->status & PVMOVE))
- continue;
- name = dev_name(seg_dev(seg, 0));
+ if (!(name = lv_move_pv_dup(mem, lv)))
+ dm_report_field_set_value(field, "", NULL);
+ else
return dm_report_field_string(rh, field, &name);
- }
-
- dm_report_field_set_value(field, "", NULL);
return 1;
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* LVM2/lib metadata/lv.c metadata/lv.h report/pr ...
@ 2010-10-12 16:12 wysochanski
0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2010-10-12 16:12 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-10-12 16:12:50
Modified files:
lib/metadata : lv.c lv.h
lib/report : properties.c report.c
Log message:
Refactor and add code for (lv) 'mirror_log' get function.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Reviewed-By: Petr Rockai <prockai@redhat.com>
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.c.diff?cvsroot=lvm2&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.h.diff?cvsroot=lvm2&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.c.diff?cvsroot=lvm2&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/report.c.diff?cvsroot=lvm2&r1=1.136&r2=1.137
--- LVM2/lib/metadata/lv.c 2010/10/12 16:12:33 1.11
+++ LVM2/lib/metadata/lv.c 2010/10/12 16:12:50 1.12
@@ -17,6 +17,19 @@
#include "metadata.h"
#include "activate.h"
#include "toolcontext.h"
+#include "segtype.h"
+
+char *lv_mirror_log_dup(struct dm_pool *mem, const struct logical_volume *lv)
+{
+ struct lv_segment *seg;
+
+ dm_list_iterate_items(seg, &lv->segments) {
+ if (!seg_is_mirrored(seg) || !seg->log_lv)
+ continue;
+ return dm_pool_strdup(mem, seg->log_lv->name);
+ }
+ return NULL;
+}
int lv_kernel_minor(const struct logical_volume *lv)
{
--- LVM2/lib/metadata/lv.h 2010/10/12 16:12:33 1.10
+++ LVM2/lib/metadata/lv.h 2010/10/12 16:12:50 1.11
@@ -58,5 +58,6 @@
char *lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv);
int lv_kernel_major(const struct logical_volume *lv);
int lv_kernel_minor(const struct logical_volume *lv);
+char *lv_mirror_log_dup(struct dm_pool *mem, const struct logical_volume *lv);
#endif
--- LVM2/lib/report/properties.c 2010/10/12 16:12:34 1.14
+++ LVM2/lib/report/properties.c 2010/10/12 16:12:50 1.15
@@ -135,7 +135,7 @@
#define _convert_lv_set _not_implemented_set
GET_LV_STR_PROPERTY_FN(lv_tags, lv_tags_dup(lv))
#define _lv_tags_set _not_implemented_set
-#define _mirror_log_get _not_implemented_get
+GET_LV_STR_PROPERTY_FN(mirror_log, lv_mirror_log_dup(lv->vg->vgmem, lv))
#define _mirror_log_set _not_implemented_set
#define _modules_get _not_implemented_get
#define _modules_set _not_implemented_set
--- LVM2/lib/report/report.c 2010/10/12 16:12:34 1.136
+++ LVM2/lib/report/report.c 2010/10/12 16:12:50 1.137
@@ -297,14 +297,10 @@
const void *data, void *private __attribute__((unused)))
{
const struct logical_volume *lv = (const struct logical_volume *) data;
- struct lv_segment *seg;
+ const char *name;
- dm_list_iterate_items(seg, &lv->segments) {
- if (!seg_is_mirrored(seg) || !seg->log_lv)
- continue;
- return dm_report_field_string(rh, field,
- (const char **) &seg->log_lv->name);
- }
+ if ((name = lv_mirror_log_dup(mem, lv)))
+ return dm_report_field_string(rh, field, &name);
dm_report_field_set_value(field, "", NULL);
return 1;
^ permalink raw reply [flat|nested] 11+ messages in thread
* LVM2/lib metadata/lv.c metadata/lv.h report/pr ...
@ 2010-10-12 16:12 wysochanski
0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2010-10-12 16:12 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-10-12 16:12:18
Modified files:
lib/metadata : lv.c lv.h
lib/report : properties.c report.c
Log message:
Refactor and add code for (lv) 'convert_lv' get function.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Reviewed-By: Petr Rockai <prockai@redhat.com>
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.c.diff?cvsroot=lvm2&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.h.diff?cvsroot=lvm2&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.c.diff?cvsroot=lvm2&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/report.c.diff?cvsroot=lvm2&r1=1.134&r2=1.135
--- LVM2/lib/metadata/lv.c 2010/10/12 16:12:02 1.9
+++ LVM2/lib/metadata/lv.c 2010/10/12 16:12:18 1.10
@@ -18,6 +18,21 @@
#include "activate.h"
#include "toolcontext.h"
+char *lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv)
+{
+ struct lv_segment *seg;
+
+ if (lv->status & (CONVERTING|MIRRORED)) {
+ seg = first_seg(lv);
+
+ /* Temporary mirror is always area_num == 0 */
+ if (seg_type(seg, 0) == AREA_LV &&
+ is_temporary_mirror_layer(seg_lv(seg, 0)))
+ return dm_pool_strdup(mem, seg_lv(seg, 0)->name);
+ }
+ return NULL;
+}
+
char *lv_move_pv_dup(struct dm_pool *mem, const struct logical_volume *lv)
{
struct lv_segment *seg;
--- LVM2/lib/metadata/lv.h 2010/10/12 16:12:02 1.8
+++ LVM2/lib/metadata/lv.h 2010/10/12 16:12:18 1.9
@@ -55,5 +55,6 @@
char *lv_path_dup(struct dm_pool *mem, const struct logical_volume *lv);
uint64_t lv_origin_size(const struct logical_volume *lv);
char *lv_move_pv_dup(struct dm_pool *mem, const struct logical_volume *lv);
+char *lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv);
#endif
--- LVM2/lib/report/properties.c 2010/10/12 16:12:02 1.12
+++ LVM2/lib/report/properties.c 2010/10/12 16:12:18 1.13
@@ -131,7 +131,7 @@
#define _copy_percent_set _not_implemented_set
GET_LV_STR_PROPERTY_FN(move_pv, lv_move_pv_dup(lv->vg->vgmem, lv))
#define _move_pv_set _not_implemented_set
-#define _convert_lv_get _not_implemented_get
+GET_LV_STR_PROPERTY_FN(convert_lv, lv_convert_lv_dup(lv->vg->vgmem, lv))
#define _convert_lv_set _not_implemented_set
GET_LV_STR_PROPERTY_FN(lv_tags, lv_tags_dup(lv))
#define _lv_tags_set _not_implemented_set
--- LVM2/lib/report/report.c 2010/10/12 16:12:02 1.134
+++ LVM2/lib/report/report.c 2010/10/12 16:12:18 1.135
@@ -392,19 +392,8 @@
{
const struct logical_volume *lv = (const struct logical_volume *) data;
const char *name = NULL;
- struct lv_segment *seg;
-
- if (lv->status & CONVERTING) {
- if (lv->status & MIRRORED) {
- seg = first_seg(lv);
-
- /* Temporary mirror is always area_num == 0 */
- if (seg_type(seg, 0) == AREA_LV &&
- is_temporary_mirror_layer(seg_lv(seg, 0)))
- name = seg_lv(seg, 0)->name;
- }
- }
+ name = lv_convert_lv_dup(mem, lv);
if (name)
return dm_report_field_string(rh, field, &name);
^ permalink raw reply [flat|nested] 11+ messages in thread
* LVM2/lib metadata/lv.c metadata/lv.h report/pr ...
@ 2010-10-12 16:12 wysochanski
0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2010-10-12 16:12 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-10-12 16:12:34
Modified files:
lib/metadata : lv.c lv.h
lib/report : properties.c report.c
Log message:
Refactor and add code for (lv) 'lv_kernel_{major|minor}' get functions.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Reviewed-By: Petr Rockai <prockai@redhat.com>
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.c.diff?cvsroot=lvm2&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.h.diff?cvsroot=lvm2&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.c.diff?cvsroot=lvm2&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/report.c.diff?cvsroot=lvm2&r1=1.135&r2=1.136
--- LVM2/lib/metadata/lv.c 2010/10/12 16:12:18 1.10
+++ LVM2/lib/metadata/lv.c 2010/10/12 16:12:33 1.11
@@ -18,6 +18,23 @@
#include "activate.h"
#include "toolcontext.h"
+int lv_kernel_minor(const struct logical_volume *lv)
+{
+ struct lvinfo info;
+
+ if (lv_info(lv->vg->cmd, lv, 0, &info, 0, 0) && info.exists)
+ return info.minor;
+ return -1;
+}
+
+int lv_kernel_major(const struct logical_volume *lv)
+{
+ struct lvinfo info;
+ if (lv_info(lv->vg->cmd, lv, 0, &info, 0, 0) && info.exists)
+ return info.major;
+ return -1;
+}
+
char *lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv)
{
struct lv_segment *seg;
--- LVM2/lib/metadata/lv.h 2010/10/12 16:12:18 1.9
+++ LVM2/lib/metadata/lv.h 2010/10/12 16:12:33 1.10
@@ -56,5 +56,7 @@
uint64_t lv_origin_size(const struct logical_volume *lv);
char *lv_move_pv_dup(struct dm_pool *mem, const struct logical_volume *lv);
char *lv_convert_lv_dup(struct dm_pool *mem, const struct logical_volume *lv);
+int lv_kernel_major(const struct logical_volume *lv);
+int lv_kernel_minor(const struct logical_volume *lv);
#endif
--- LVM2/lib/report/properties.c 2010/10/12 16:12:18 1.13
+++ LVM2/lib/report/properties.c 2010/10/12 16:12:34 1.14
@@ -111,9 +111,9 @@
#define _lv_minor_set _not_implemented_set
#define _lv_read_ahead_get _not_implemented_get
#define _lv_read_ahead_set _not_implemented_set
-#define _lv_kernel_major_get _not_implemented_get
+GET_LV_NUM_PROPERTY_FN(lv_kernel_major, lv_kernel_major(lv))
#define _lv_kernel_major_set _not_implemented_set
-#define _lv_kernel_minor_get _not_implemented_get
+GET_LV_NUM_PROPERTY_FN(lv_kernel_minor, lv_kernel_minor(lv))
#define _lv_kernel_minor_set _not_implemented_set
#define _lv_kernel_read_ahead_get _not_implemented_get
#define _lv_kernel_read_ahead_set _not_implemented_set
--- LVM2/lib/report/report.c 2010/10/12 16:12:18 1.135
+++ LVM2/lib/report/report.c 2010/10/12 16:12:34 1.136
@@ -212,10 +212,10 @@
const void *data, void *private __attribute__((unused)))
{
const struct logical_volume *lv = (const struct logical_volume *) data;
- struct lvinfo info;
+ int major;
- if (lv_info(lv->vg->cmd, lv, 0, &info, 0, 0) && info.exists)
- return dm_report_field_int(rh, field, &info.major);
+ if ((major = lv_kernel_major(lv)) >= 0)
+ return dm_report_field_int(rh, field, &major);
return dm_report_field_int32(rh, field, &_minusone32);
}
@@ -225,10 +225,10 @@
const void *data, void *private __attribute__((unused)))
{
const struct logical_volume *lv = (const struct logical_volume *) data;
- struct lvinfo info;
+ int minor;
- if (lv_info(lv->vg->cmd, lv, 0, &info, 0, 0) && info.exists)
- return dm_report_field_int(rh, field, &info.minor);
+ if ((minor = lv_kernel_minor(lv)) >= 0)
+ return dm_report_field_int(rh, field, &minor);
return dm_report_field_int32(rh, field, &_minusone32);
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* LVM2/lib metadata/lv.c metadata/lv.h report/pr ...
@ 2010-10-12 16:11 wysochanski
0 siblings, 0 replies; 11+ messages in thread
From: wysochanski @ 2010-10-12 16:11 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-10-12 16:11:34
Modified files:
lib/metadata : lv.c lv.h
lib/report : properties.c report.c
Log message:
Refactor and add code for (lv) 'lv_path' get function.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.c.diff?cvsroot=lvm2&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv.h.diff?cvsroot=lvm2&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/properties.c.diff?cvsroot=lvm2&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/report.c.diff?cvsroot=lvm2&r1=1.131&r2=1.132
--- LVM2/lib/metadata/lv.c 2010/09/30 20:47:18 1.6
+++ LVM2/lib/metadata/lv.c 2010/10/12 16:11:34 1.7
@@ -16,6 +16,28 @@
#include "lib.h"
#include "metadata.h"
#include "activate.h"
+#include "toolcontext.h"
+
+char *lv_path_dup(struct dm_pool *mem, const struct logical_volume *lv)
+{
+ char *repstr;
+ size_t len;
+
+ len = strlen(lv->vg->cmd->dev_dir) + strlen(lv->vg->name) +
+ strlen(lv->name) + 2;
+
+ if (!(repstr = dm_pool_zalloc(mem, len))) {
+ log_error("dm_pool_alloc failed");
+ return 0;
+ }
+
+ if (dm_snprintf(repstr, len, "%s%s/%s",
+ lv->vg->cmd->dev_dir, lv->vg->name, lv->name) < 0) {
+ log_error("lvpath snprintf failed");
+ return 0;
+ }
+ return repstr;
+}
char *lv_uuid_dup(const struct logical_volume *lv)
{
--- LVM2/lib/metadata/lv.h 2010/09/30 20:47:18 1.5
+++ LVM2/lib/metadata/lv.h 2010/10/12 16:11:34 1.6
@@ -52,5 +52,6 @@
char *lv_attr_dup(struct dm_pool *mem, const struct logical_volume *lv);
char *lv_uuid_dup(const struct logical_volume *lv);
char *lv_tags_dup(const struct logical_volume *lv);
+char *lv_path_dup(struct dm_pool *mem, const struct logical_volume *lv);
#endif
--- LVM2/lib/report/properties.c 2010/10/12 16:11:20 1.9
+++ LVM2/lib/report/properties.c 2010/10/12 16:11:34 1.10
@@ -101,7 +101,7 @@
#define _lv_uuid_set _not_implemented_set
#define _lv_name_get _not_implemented_get
#define _lv_name_set _not_implemented_set
-#define _lv_path_get _not_implemented_get
+GET_LV_STR_PROPERTY_FN(lv_path, lv_path_dup(lv->vg->vgmem, lv))
#define _lv_path_set _not_implemented_set
GET_LV_STR_PROPERTY_FN(lv_attr, lv_attr_dup(lv->vg->vgmem, lv))
#define _lv_attr_set _not_implemented_set
--- LVM2/lib/report/report.c 2010/09/30 14:09:10 1.131
+++ LVM2/lib/report/report.c 2010/10/12 16:11:34 1.132
@@ -350,18 +350,9 @@
{
const struct logical_volume *lv = (const struct logical_volume *) data;
char *repstr;
- size_t len;
- len = strlen(lv->vg->cmd->dev_dir) + strlen(lv->vg->name) + strlen(lv->name) + 2;
- if (!(repstr = dm_pool_zalloc(mem, len))) {
- log_error("dm_pool_alloc failed");
+ if (!(repstr = lv_path_dup(mem, lv)))
return 0;
- }
-
- if (dm_snprintf(repstr, len, "%s%s/%s", lv->vg->cmd->dev_dir, lv->vg->name, lv->name) < 0) {
- log_error("lvpath snprintf failed");
- return 0;
- }
dm_report_field_set_value(field, repstr, NULL);
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2010-11-17 20:08 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-12 16:11 LVM2/lib metadata/lv.c metadata/lv.h report/pr wysochanski
-- strict thread matches above, loose matches on Subject: below --
2010-11-17 20:08 mornfall
2010-10-21 14:49 wysochanski
2010-10-21 14:49 wysochanski
2010-10-21 14:49 wysochanski
2010-10-12 16:13 wysochanski
2010-10-12 16:12 wysochanski
2010-10-12 16:12 wysochanski
2010-10-12 16:12 wysochanski
2010-10-12 16:12 wysochanski
2010-10-12 16:11 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).