Switch status from 32-bit to 64-bit
PATCH 1/1 Switch status from 32-bit to 64-bit
The physical_volume, volume_group, logical_volume and lv_segment structures' 'status' member is now uint64_t.
The alignment of these structures was also audited to remove holes. The movement of some members in 'volume_group' and 'lv_segment' eliminates holes. The 'physical_volume' structure still has one 4-byte hole after 'pe_size'; the other structures no longer have any holes.
structure name/size before/size after:
physical_volume/176/176
volume_group/184/184
logical_volume/200/200
lv_segment/144/144
All changes have been successfully tested with the lvm2 testsuite.
Signed-off-by Mike Snitzer <[email protected]>
--
lib/display/display.c | 6 +++--- lib/format_text/export.c | 2 +- lib/format_text/flags.c | 8 ++++---- lib/format_text/format-text.c | 4 ++-- lib/format_text/format-text.h | 2 +- lib/format_text/import-export.h | 8 ++++---- lib/format_text/import.c | 2 +- lib/format_text/import_vsn1.c | 4 ++-- lib/format_text/text_label.c | 2 +- lib/metadata/lv_alloc.h | 10 +++++----- lib/metadata/lv_manip.c | 34 +++++++++++++++++----------------- lib/metadata/metadata-exported.h | 36 ++++++++++++++++++------------------ lib/metadata/metadata.c | 14 +++++++------- lib/metadata/mirror.c | 6 +++--- 14 files changed, 69 insertions(+), 69 deletions(-)
lib/display/display.c +3 -3
@@ -317,7 +317,7 @@ void pvdisplay_colons(const struct physireturn ; } - log_print("%s:%s:%" PRIu64 ":-1:%u:%u:-1:%" PRIu32 ":%u:%u:%u:%s", + log_print("%s:%s:%" PRIu64 ":-1:%" PRIu64 ":%" PRIu64 ":-1:%" PRIu32 ":%u:%u:%u:%s", pv_dev_name(pv), pv->vg_name, pv->size, /* FIXME pv->pv_number, Derive or remove? */ pv->status, /* FIXME Support old or new format here? */
@@ -459,7 +459,7 @@ void lvdisplay_colons(const struct logicstruct lvinfo info; inkernel =lv_info (lv->vg->cmd, lv, &info,1 ,0 ) && info.exists; - log_print("%s%s/%s:%s:%d:%d:-1:%d:%" PRIu64 ":%d:-1:%d:%d:%d:%d", + log_print("%s%s/%s:%s:%" PRIu64 ":%d:-1:%d:%" PRIu64 ":%d:-1:%d:%d:%d:%d", lv->vg->cmd->dev_dir, lv->vg->name, lv->name,
@@ -760,7 +760,7 @@ void vgdisplay_colons(const struct volumreturn ; } - log_print("%s:%s:%d:-1:%u:%u:%u:-1:%u:%u:%u:%" PRIu64 ":%" PRIu32 + log_print("%s:%s:%" PRIu64 ":-1:%u:%u:%u:-1:%u:%u:%u:%" PRIu64 ":%" PRIu32 ":%u:%u:%u:%s", vg->name, access_str,
lib/format_text/export.c +1 -1
@@ -349,7 +349,7 @@ static int _print_header(struct formattereturn 1 ; } -static int _print_flag_config (struct formatter *f,int status,int type) +static int _print_flag_config (struct formatter *f,uint64_t status,int type) {char buffer[4096 ];if (!print_flags (status, type |STATUS_FLAG , buffer,sizeof (buffer)))
lib/format_text/flags.c +4 -4
@@ -23,7 +23,7 @@* converted into arrays of strings. */ struct flag { -const int mask; +const uint64_t mask;const char *description;int kind; };
@@ -91,7 +91,7 @@ static struct flag *_get_flags(int type)* using one of the tables defined at the top of * the file. */ -int print_flags (uint32_t status,int type,char *buffer,size_t size) +int print_flags (uint64_t status,int type,char *buffer,size_t size) {int f, first =1 ;struct flag *flags;
@@ -135,10 +135,10 @@ int print_flags(uint32_t status, int typreturn 1 ; } -int read_flags (uint32_t *status,int type,struct config_value *cv) +int read_flags (uint64_t *status,int type,struct config_value *cv) {int f; -uint32_t s =0 ; +uint64_t s =0 ;struct flag *flags;if (!(flags =_get_flags (type)))
lib/format_text/format-text.c +2 -2
@@ -1037,7 +1037,7 @@ static int _scan_file(const struct formaconst char *vgname_from_mda (const struct format_type *fmt,struct device_area *dev_area,struct id *vgid, -uint32_t *vgstatus,char **creation_host, +uint64_t *vgstatus,char **creation_host,uint64_t *mda_free_sectors) {struct raw_locn *rlocn;
@@ -1146,7 +1146,7 @@ static int _scan_raw(const struct formatstruct volume_group *vg;struct format_instance fid;struct id vgid; -uint32_t vgstatus; +uint64_t vgstatus; raw_list = &((struct mda_lists *) fmt->private)->raws;
lib/format_text/format-text.h +1 -1
@@ -61,7 +61,7 @@ void del_mdas(struct dm_list *mdas);const char *vgname_from_mda (const struct format_type *fmt,struct device_area *dev_area,struct id *vgid, -uint32_t *vgstatus,char **creation_host, +uint64_t *vgstatus,char **creation_host,uint64_t *mda_free_sectors);#endif
lib/format_text/import-export.h +4 -4
@@ -51,14 +51,14 @@ struct text_vg_version_ops { time_t *when, char **desc);const char *(*read_vgname) (const struct format_type *fmt,struct config_tree *cft, -struct id *vgid,uint32_t *vgstatus, +struct id *vgid,uint64_t *vgstatus,char **creation_host); };struct text_vg_version_ops *text_vg_vsn1_init (void ); -int print_flags (uint32_t status,int type,char *buffer,size_t size); -int read_flags (uint32_t *status,int type,struct config_value *cv); +int print_flags (uint64_t status,int type,char *buffer,size_t size); +int read_flags (uint64_t *status,int type,struct config_value *cv);int print_tags (struct dm_list *tags,char *buffer,size_t size);int read_tags (struct dm_pool *mem,struct dm_list *tags,struct config_value *cv);
@@ -81,7 +81,7 @@ const char *text_vgname_import(const str off_t offset, uint32_t size, off_t offset2, uint32_t size2, checksum_fn_t checksum_fn, uint32_t checksum, - struct id *vgid, uint32_t *vgstatus, + struct id *vgid, uint64_t *vgstatus, char **creation_host);#endif
lib/format_text/import.c +1 -1
@@ -40,7 +40,7 @@ const char *text_vgname_import(const str off_t offset, uint32_t size, off_t offset2, uint32_t size2, checksum_fn_t checksum_fn, uint32_t checksum, - struct id *vgid, uint32_t *vgstatus, + struct id *vgid, uint64_t *vgstatus, char **creation_host) { struct config_tree *cft;
lib/format_text/import_vsn1.c +2 -2
@@ -125,7 +125,7 @@ static int _read_id(struct id *id, strucreturn 1 ; } -static int _read_flag_config (struct config_node *n,uint32_t *status,int type) +static int _read_flag_config (struct config_node *n,uint64_t *status,int type) {struct config_node *cn; *status =0 ;
@@ -809,7 +809,7 @@ static void _read_desc(struct dm_pool *mstatic const char *_read_vgname (const struct format_type *fmt,struct config_tree *cft,struct id *vgid, -uint32_t *vgstatus,char **creation_host) +uint64_t *vgstatus,char **creation_host) {struct config_node *vgn;struct dm_pool *mem = fmt->cmd->mem;
lib/format_text/text_label.c +1 -1
@@ -259,7 +259,7 @@ static int _text_read(struct labeller *lstruct id vgid;struct mda_context *mdac;const char *vgname; -uint32_t vgstatus; +uint64_t vgstatus;char *creation_host; pvhdr = (struct pv_header *) ((void *) buf +xlate32 (lh->offset_xl));
lib/metadata/lv_alloc.h +5 -5
@@ -19,7 +19,7 @@ struct lv_segment *alloc_lv_segment(struconst struct segment_type *segtype, struct logical_volume *lv, uint32_t le, uint32_t len, - uint32_t status, + uint64_t status, uint32_t stripe_size, struct logical_volume *log_lv, uint32_t area_count,
@@ -29,7 +29,7 @@ struct lv_segment *alloc_lv_segment(stru uint32_t extents_copied);struct lv_segment *alloc_snapshot_seg (struct logical_volume *lv, -uint32_t status,uint32_t old_le_count); +uint64_t status,uint32_t old_le_count);int set_lv_segment_area_pv (struct lv_segment *seg,uint32_t area_num,struct physical_volume *pv,uint32_t pe);
@@ -57,7 +57,7 @@ int lv_add_segment(struct alloc_handle *struct logical_volume *lv, const struct segment_type *segtype, uint32_t stripe_size, - uint32_t status, + uint64_t status, uint32_t region_size, struct logical_volume *log_lv);
@@ -67,10 +67,10 @@ int lv_add_mirror_areas(struct alloc_hanint lv_add_mirror_lvs (struct logical_volume *lv,struct logical_volume **sub_lvs,uint32_t num_extra_areas, -uint32_t status,uint32_t region_size); +uint64_t status,uint32_t region_size);int lv_add_log_segment (struct alloc_handle *ah,struct logical_volume *log_lv); -int lv_add_virtual_segment (struct logical_volume *lv,uint32_t status, +int lv_add_virtual_segment (struct logical_volume *lv,uint64_t status,uint32_t extents,const struct segment_type *segtype);void alloc_destroy (struct alloc_handle *ah);
lib/metadata/lv_manip.c +17 -17
@@ -167,7 +167,7 @@ struct lv_segment *alloc_lv_segment(struconst struct segment_type *segtype, struct logical_volume *lv, uint32_t le, uint32_t len, - uint32_t status, + uint64_t status, uint32_t stripe_size, struct logical_volume *log_lv, uint32_t area_count,
@@ -213,7 +213,7 @@ struct lv_segment *alloc_lv_segment(stru }struct lv_segment *alloc_snapshot_seg (struct logical_volume *lv, -uint32_t status,uint32_t old_le_count) +uint64_t status,uint32_t old_le_count) {struct lv_segment *seg;const struct segment_type *segtype;
@@ -639,7 +639,7 @@ static int _log_parallel_areas(struct dmreturn 1 ; } -static int _setup_alloced_segment(struct logical_volume *lv, uint32_t status, +static int _setup_alloced_segment(struct logical_volume *lv, uint64_t status, uint32_t area_count, uint32_t stripe_size, const struct segment_type *segtype,
@@ -682,7 +682,7 @@ static int _setup_alloced_segment(struct static int _setup_alloced_segments(struct logical_volume *lv, struct dm_list *alloced_areas, uint32_t area_count, - uint32_t status, + uint64_t status, uint32_t stripe_size, const struct segment_type *segtype, uint32_t region_size,
@@ -1278,7 +1278,7 @@ static int _allocate(struct alloc_handlereturn r; } -int lv_add_virtual_segment (struct logical_volume *lv,uint32_t status, +int lv_add_virtual_segment (struct logical_volume *lv,uint64_t status,uint32_t extents,const struct segment_type *segtype) {struct lv_segment *seg;
@@ -1355,7 +1355,7 @@ int lv_add_segment(struct alloc_handle *struct logical_volume *lv, const struct segment_type *segtype, uint32_t stripe_size, - uint32_t status, + uint64_t status, uint32_t region_size, struct logical_volume *log_lv) {
@@ -1495,7 +1495,7 @@ int lv_add_mirror_areas(struct alloc_hanint lv_add_mirror_lvs (struct logical_volume *lv,struct logical_volume **sub_lvs,uint32_t num_extra_areas, -uint32_t status,uint32_t region_size) +uint64_t status,uint32_t region_size) {struct lv_segment *seg;uint32_t old_area_count, new_area_count;
@@ -1620,7 +1620,7 @@ int lv_extend(struct logical_volume *lv, uint32_t mirrors, uint32_t extents, struct physical_volume *mirrored_pv __attribute((unused)), uint32_t mirrored_pe __attribute((unused)), - uint32_t status, struct dm_list *allocatable_pvs, + uint64_t status, struct dm_list *allocatable_pvs, alloc_policy_t alloc) { int r = 1;
@@ -1885,7 +1885,7 @@ struct logical_volume *alloc_lv(struct d*/ struct logical_volume *lv_create_empty (const char *name,union lvid *lvid, -uint32_t status, +uint64_t status,alloc_policy_t alloc,struct volume_group *vg) {
@@ -2266,7 +2266,7 @@ int split_parent_segments_for_layer(struint remove_layers_for_segments (struct cmd_context *cmd,struct logical_volume *lv,struct logical_volume *layer_lv, -uint32_t status_mask,struct dm_list *lvs_changed) +uint64_t status_mask,struct dm_list *lvs_changed) {struct lv_segment *seg, *lseg;uint32_t s;
@@ -2298,7 +2298,7 @@ int remove_layers_for_segments(struct cm }if ((lseg->status & status_mask) != status_mask) {log_error ("Layer status does not match: " -"%s:%" PRIu32" status: 0x%x/0x%x" , +"%s:%" PRIu32" status: 0x%" PRIx64"/0x%" PRIx64, layer_lv->name, lseg->le, lseg->status, status_mask);return 0 ;
@@ -2347,7 +2347,7 @@ int remove_layers_for_segments(struct cm/* Remove a layer */ int remove_layers_for_segments_all (struct cmd_context *cmd,struct logical_volume *layer_lv, -uint32_t status_mask, +uint64_t status_mask,struct dm_list *lvs_changed) {struct lv_list *lvl;
@@ -2372,7 +2372,7 @@ int remove_layers_for_segments_all(strucstatic int _move_lv_segments (struct logical_volume *lv_to,struct logical_volume *lv_from, -uint32_t set_status,uint32_t reset_status) +uint64_t set_status,uint64_t reset_status) {struct lv_segment *seg;
@@ -2454,7 +2454,7 @@ int remove_layer_from_lv(struct logical_*/ struct logical_volume *insert_layer_for_lv (struct cmd_context *cmd,struct logical_volume *lv_where, -uint32_t status, +uint64_t status,const char *layer_suffix) {struct logical_volume *layer_lv;
@@ -2543,7 +2543,7 @@ struct logical_volume *insert_layer_for_*/ static int _extend_layer_lv_for_segment (struct logical_volume *layer_lv,struct lv_segment *seg,uint32_t s, -uint32_t status) +uint64_t status) {struct lv_segment *mapseg;struct segment_type *segtype;
@@ -2690,7 +2690,7 @@ static int _align_segment_boundary_to_peint insert_layer_for_segments_on_pv (struct cmd_context *cmd,struct logical_volume *lv_where,struct logical_volume *layer_lv, -uint32_t status, +uint64_t status,struct pv_list *pvl,struct dm_list *lvs_changed) {
@@ -2833,7 +2833,7 @@ int lv_create_single(struct volume_group {struct cmd_context *cmd = vg->cmd;uint32_t size_rest; -uint32_t status =0 ; +uint64_t status =0 ;struct logical_volume *lv, *org =NULL ;int origin_active =0 ;char lv_name_buf[128 ];
lib/metadata/metadata-exported.h +18 -18
@@ -181,7 +181,7 @@ struct physical_volume {const char *vg_name;struct id vgid; -uint32_t status; +uint64_t status;uint64_t size;/* physical extents */
@@ -208,13 +208,13 @@ struct volume_group {struct format_instance *fid;uint32_t seqno;/* Metadata sequence number */ +alloc_policy_t alloc; +uint64_t status; +struct id id;char *name;char *system_id; -uint32_t status; -alloc_policy_t alloc; -uint32_t extent_size;uint32_t extent_count;uint32_t free_count;
@@ -285,16 +285,16 @@ struct lv_segment {uint32_t le;uint32_t len; -uint32_t status; +uint64_t status;/* FIXME Fields depend on segment type */ uint32_t stripe_size;uint32_t area_count;uint32_t area_len; +uint32_t chunk_size;/* For snapshots - in sectors */ struct logical_volume *origin;struct logical_volume *cow;struct dm_list origin_list; -uint32_t chunk_size;/* For snapshots - in sectors */ uint32_t region_size;/* For mirrors - in sectors */ uint32_t extents_copied;struct logical_volume *log_lv;
@@ -315,7 +315,7 @@ struct logical_volume {struct volume_group *vg; -uint32_t status; +uint64_t status;alloc_policy_t alloc;uint32_t read_ahead;int32_t major;
@@ -479,7 +479,7 @@ void vg_release(struct volume_group *vg)/* Manipulate LVs */ struct logical_volume *lv_create_empty (const char *name,union lvid *lvid, -uint32_t status, +uint64_t status,alloc_policy_t alloc,struct volume_group *vg);
@@ -502,7 +502,7 @@ int lv_extend(struct logical_volume *lv, uint32_t stripes, uint32_t stripe_size, uint32_t mirrors, uint32_t extents, struct physical_volume *mirrored_pv, uint32_t mirrored_pe, - uint32_t status, struct dm_list *allocatable_pvs, + uint64_t status, struct dm_list *allocatable_pvs, alloc_policy_t alloc);/* lv must be part of lv->vg->lvs */
@@ -565,16 +565,16 @@ int lv_create_single(struct volume_groupint insert_layer_for_segments_on_pv (struct cmd_context *cmd,struct logical_volume *lv_where,struct logical_volume *layer_lv, -uint32_t status, +uint64_t status,struct pv_list *pv,struct dm_list *lvs_changed);int remove_layers_for_segments (struct cmd_context *cmd,struct logical_volume *lv,struct logical_volume *layer_lv, -uint32_t status_mask,struct dm_list *lvs_changed); +uint64_t status_mask,struct dm_list *lvs_changed);int remove_layers_for_segments_all (struct cmd_context *cmd,struct logical_volume *layer_lv, -uint32_t status_mask, +uint64_t status_mask,struct dm_list *lvs_changed);int split_parent_segments_for_layer (struct cmd_context *cmd,struct logical_volume *layer_lv);
@@ -582,7 +582,7 @@ int remove_layer_from_lv(struct logical_ struct logical_volume *layer_lv);struct logical_volume *insert_layer_for_lv (struct cmd_context *cmd,struct logical_volume *lv_where, -uint32_t status, +uint64_t status,const char *layer_suffix);/* Find a PV within a given VG */
@@ -632,7 +632,7 @@ int vg_add_snapshot(struct logical_volumint vg_remove_snapshot (struct logical_volume *cow); -int vg_check_status (const struct volume_group *vg,uint32_t status); +int vg_check_status (const struct volume_group *vg,uint64_t status);/* * Returns visible LV count - number of LVs from user perspective
@@ -654,7 +654,7 @@ int lv_add_mirrors(struct cmd_context *c struct dm_list *pvs, alloc_policy_t alloc, uint32_t flags);int lv_remove_mirrors (struct cmd_context *cmd,struct logical_volume *lv,uint32_t mirrors,uint32_t log_count, -struct dm_list *pvs,uint32_t status_mask); +struct dm_list *pvs,uint64_t status_mask);int is_temporary_mirror_layer (const struct logical_volume *lv);struct logical_volume *find_temporary_mirror (const struct logical_volume *lv);
@@ -662,7 +662,7 @@ uint32_t lv_mirror_count(const struct louint32_t adjusted_mirror_region_size (uint32_t extent_size,uint32_t extents,uint32_t region_size);int remove_mirrors_from_segments (struct logical_volume *lv, -uint32_t new_mirrors,uint32_t status_mask); +uint32_t new_mirrors,uint64_t status_mask);int add_mirrors_to_segments (struct cmd_context *cmd,struct logical_volume *lv,uint32_t mirrors,uint32_t region_size,struct dm_list *allocatable_pvs,alloc_policy_t alloc);
@@ -711,7 +711,7 @@ struct device *pv_dev(const struct physiconst char *pv_vg_name (const struct physical_volume *pv);const char *pv_dev_name (const struct physical_volume *pv);uint64_t pv_size (const struct physical_volume *pv); -uint32_t pv_status (const struct physical_volume *pv); +uint64_t pv_status (const struct physical_volume *pv);uint32_t pv_pe_size (const struct physical_volume *pv);uint64_t pv_pe_start (const struct physical_volume *pv);uint32_t pv_pe_count (const struct physical_volume *pv);
@@ -722,7 +722,7 @@ uint64_t lv_size(const struct logical_voint vg_missing_pv_count (const struct volume_group *vg);uint32_t vg_seqno (const struct volume_group *vg); -uint32_t vg_status (const struct volume_group *vg); +uint64_t vg_status (const struct volume_group *vg);uint64_t vg_size (const struct volume_group *vg);uint64_t vg_free (const struct volume_group *vg);uint64_t vg_extent_size (const struct volume_group *vg);
lib/metadata/metadata.c +7 -7
@@ -56,7 +56,7 @@ static struct physical_volume *_find_pv_ const struct id *id);static uint32_t _vg_bad_status_bits (const struct volume_group *vg, -uint32_t status); +uint64_t status);const char _really_init[] ="Really INITIALIZE physical volume \"%s\" of volume group \"%s\" [y/n]? " ;
@@ -3220,7 +3220,7 @@ int vg_check_write_mode(struct volume_gr* FIXME Remove the unnecessary duplicate definitions and return bits directly. */ static uint32_t _vg_bad_status_bits (const struct volume_group *vg, -uint32_t status) +uint64_t status) {uint32_t failure =0 ;
@@ -3257,7 +3257,7 @@ static uint32_t _vg_bad_status_bits(cons* @vg - volume group to check status flags * @status - specific status flags to check (e.g. EXPORTED_VG) */ -int vg_check_status (const struct volume_group *vg,uint32_t status) +int vg_check_status (const struct volume_group *vg,uint64_t status) {return !_vg_bad_status_bits (vg, status); }
@@ -3303,7 +3303,7 @@ static struct volume_group *_recover_vg(*/ static struct volume_group *_vg_lock_and_read (struct cmd_context *cmd,const char *vg_name,const char *vgid,uint32_t lock_flags, -uint32_t status_flags,uint32_t misc_flags) +uint64_t status_flags,uint32_t misc_flags) {struct volume_group *vg =NULL ;const char *lock_name;
@@ -3429,7 +3429,7 @@ bad:struct volume_group *vg_read (struct cmd_context *cmd,const char *vg_name,const char *vgid,uint32_t flags) { -uint32_t status =0 ; +uint64_t status =0 ;uint32_t lock_flags =LCK_VG_READ ;if (flags &READ_FOR_UPDATE ) {
@@ -3548,7 +3548,7 @@ uint64_t pv_size(const struct physical_vreturn pv_field (pv, size); } -uint32_t pv_status (const struct physical_volume *pv) +uint64_t pv_status (const struct physical_volume *pv) {return pv_field (pv, status); }
@@ -3586,7 +3586,7 @@ uint32_t vg_seqno(const struct volume_grreturn vg->seqno; } -uint32_t vg_status (const struct volume_group *vg) +uint64_t vg_status (const struct volume_group *vg) {return vg->status; }
lib/metadata/mirror.c +3 -3
@@ -973,7 +973,7 @@ static int _create_mimage_lvs(struct all* has the status bits on. */ int remove_mirrors_from_segments (struct logical_volume *lv, -uint32_t new_mirrors,uint32_t status_mask) +uint32_t new_mirrors,uint64_t status_mask) {struct lv_segment *seg;uint32_t s;
@@ -986,7 +986,7 @@ int remove_mirrors_from_segments(structreturn 0 ; }if ((seg->status & status_mask) != status_mask) {log_error ("Segment status does not match: %s:%" PRIu32 -" status:0x%x/0x%x" , lv->name, seg->le, +" status:0x%" PRIx64"/0x%" PRIx64, lv->name, seg->le, seg->status, status_mask);return 0 ; }
@@ -1609,7 +1609,7 @@ int lv_add_mirrors(struct cmd_context *cint lv_remove_mirrors (struct cmd_context *cmd __attribute((unused)),struct logical_volume *lv,uint32_t mirrors,uint32_t log_count,struct dm_list *pvs, -uint32_t status_mask) +uint64_t status_mask) {uint32_t new_mirrors;struct lv_segment *seg;