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

report: Remove lv_volume_type field.

Browse Source 
Like lv_target_type, this field needs reworking.
This commit is contained in:
Alasdair G Kergon 2014-08-05 02:04:16 +01:00
parent 2dac5525fb
commit e94442bffa
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/report/columns.h
View File

@ -39,7 +39,7 @@ FIELD(LVS, lv, STR, "Path", lvid, 4, lvpath, lv_path, "Full pathname for LV. Bla
FIELD(LVS, lv, STR, "DMPath", lvid, 6, lvdmpath, lv_dm_path, "Internal device-mapper pathname for LV (in /dev/mapper directory).", 0) FIELD(LVS, lv, STR, "DMPath", lvid, 6, lvdmpath, lv_dm_path, "Internal device-mapper pathname for LV (in /dev/mapper directory).", 0)
FIELD(LVS, lv, STR, "Parent", lvid, 6, lvparent, lv_parent, "For LVs that are components of another LV, the parent LV.", 0) FIELD(LVS, lv, STR, "Parent", lvid, 6, lvparent, lv_parent, "For LVs that are components of another LV, the parent LV.", 0)
FIELD(LVS, lv, STR, "Attr", lvid, 4, lvstatus, lv_attr, "Various attributes - see man page.", 0) FIELD(LVS, lv, STR, "Attr", lvid, 4, lvstatus, lv_attr, "Various attributes - see man page.", 0)
FIELD(LVS, lv, STR, "Type", lvid, 10, lvvolumetype, lv_volume_type, "LV volume type.", 0) //FIELD(LVS, lv, STR, "Type", lvid, 10, lvvolumetype, lv_volume_type, "LV volume type.", 0)
FIELD(LVS, lv, BIN, "InitImgSync", lvid, 10, lvinitialimagesync, lv_initial_image_sync, "Set if mirror/RAID images underwent initial resynchronization.", 0) FIELD(LVS, lv, BIN, "InitImgSync", lvid, 10, lvinitialimagesync, lv_initial_image_sync, "Set if mirror/RAID images underwent initial resynchronization.", 0)
FIELD(LVS, lv, BIN, "ImgSynced", lvid, 10, lvimagesynced, lv_image_synced, "Set if mirror/RAID image is synchronized.", 0) FIELD(LVS, lv, BIN, "ImgSynced", lvid, 10, lvimagesynced, lv_image_synced, "Set if mirror/RAID image is synchronized.", 0)
FIELD(LVS, lv, BIN, "Merging", lvid, 10, lvmerging, lv_merging, "Set if snapshot LV is being merged to origin.", 0) FIELD(LVS, lv, BIN, "Merging", lvid, 10, lvmerging, lv_merging, "Set if snapshot LV is being merged to origin.", 0)

4
lib/report/properties.c
View File

@ -179,8 +179,8 @@ GET_PV_NUM_PROPERTY_FN(pv_ba_size, SECTOR_SIZE * pv->ba_size)
#define _vg_clustered_set prop_not_implemented_set #define _vg_clustered_set prop_not_implemented_set
#define _vg_clustered_get prop_not_implemented_get #define _vg_clustered_get prop_not_implemented_get
#define _lv_volume_type_set prop_not_implemented_set //#define _lv_volume_type_set prop_not_implemented_set
#define _lv_volume_type_get prop_not_implemented_get //#define _lv_volume_type_get prop_not_implemented_get
#define _lv_initial_image_sync_set prop_not_implemented_set #define _lv_initial_image_sync_set prop_not_implemented_set
#define _lv_initial_image_sync_get prop_not_implemented_get #define _lv_initial_image_sync_get prop_not_implemented_get
#define _lv_image_synced_get prop_not_implemented_get #define _lv_image_synced_get prop_not_implemented_get

2
lib/report/report.c
View File

@ -1318,6 +1318,7 @@ static int _vgclustered_disp(struct dm_report *rh, struct dm_pool *mem,
return _binary_disp(rh, mem, field, clustered, FIRST_NAME(vg_clustered_y), private); return _binary_disp(rh, mem, field, clustered, FIRST_NAME(vg_clustered_y), private);
} }
/* FIXME Replace with something that provides a complete unique description for every combination.
static int _lvvolumetype_disp(struct dm_report *rh, struct dm_pool *mem, static int _lvvolumetype_disp(struct dm_report *rh, struct dm_pool *mem,
struct dm_report_field *field, struct dm_report_field *field,
const void *data, void *private) const void *data, void *private)
@ -1325,6 +1326,7 @@ static int _lvvolumetype_disp(struct dm_report *rh, struct dm_pool *mem,
const char *type = lv_type_name((const struct logical_volume *) data); const char *type = lv_type_name((const struct logical_volume *) data);
return _string_disp(rh, mem, field, &type, private); return _string_disp(rh, mem, field, &type, private);
} }
*/
static int _lvinitialimagesync_disp(struct dm_report *rh, struct dm_pool *mem, static int _lvinitialimagesync_disp(struct dm_report *rh, struct dm_pool *mem,
struct dm_report_field *field, struct dm_report_field *field,