shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Update a few more uint64_t's related to the 64-bit status change.

Browse Source 
At this point they probably do not matter but going forward they
may - depends on future patches for replicator, etc.  I think
these probably got missed because they were 'flags' so I changed
the name to 'status' to be consistent.  So the on-disk
things 'flags' and the in structure 'status' (bits).
NOTE: WHATS_NEW already has entry for this in current release.

Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Acked-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Dave Wysochanski 2009-12-04 17:48:32 +00:00
parent 05d08428b3
commit 59baeb838c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/format_text/import_vsn1.c
View File

@ -372,7 +372,7 @@ static int _read_segment(struct dm_pool *mem, struct volume_group *vg,
int text_import_areas(struct lv_segment *seg, const struct config_node *sn, int text_import_areas(struct lv_segment *seg, const struct config_node *sn,
const struct config_node *cn, struct dm_hash_table *pv_hash, const struct config_node *cn, struct dm_hash_table *pv_hash,
uint32_t flags) uint64_t status)
{ {
unsigned int s; unsigned int s;
struct config_value *cv; struct config_value *cv;
@ -410,7 +410,7 @@ int text_import_areas(struct lv_segment *seg, const struct config_node *sn,
} else if ((lv1 = find_lv(seg->lv->vg, cv->v.str))) { } else if ((lv1 = find_lv(seg->lv->vg, cv->v.str))) {
if (!set_lv_segment_area_lv(seg, s, lv1, if (!set_lv_segment_area_lv(seg, s, lv1,
(uint32_t) cv->next->v.i, (uint32_t) cv->next->v.i,
flags)) status))
return_0; return_0;
} else { } else {
log_error("Couldn't find volume '%s' " log_error("Couldn't find volume '%s' "

2
lib/format_text/text_import.h
View File

@ -21,6 +21,6 @@ struct config_node;
int text_import_areas(struct lv_segment *seg, const struct config_node *sn, int text_import_areas(struct lv_segment *seg, const struct config_node *sn,
const struct config_node *cn, struct dm_hash_table *pv_hash, const struct config_node *cn, struct dm_hash_table *pv_hash,
uint32_t flags); uint64_t status);
#endif #endif

2
lib/metadata/lv_alloc.h
View File

@ -35,7 +35,7 @@ int set_lv_segment_area_pv(struct lv_segment *seg, uint32_t area_num,
struct physical_volume *pv, uint32_t pe); struct physical_volume *pv, uint32_t pe);
int set_lv_segment_area_lv(struct lv_segment *seg, uint32_t area_num, int set_lv_segment_area_lv(struct lv_segment *seg, uint32_t area_num,
struct logical_volume *lv, uint32_t le, struct logical_volume *lv, uint32_t le,
uint32_t flags); uint64_t status);
int move_lv_segment_area(struct lv_segment *seg_to, uint32_t area_to, int move_lv_segment_area(struct lv_segment *seg_to, uint32_t area_to,
struct lv_segment *seg_from, uint32_t area_from); struct lv_segment *seg_from, uint32_t area_from);
void release_lv_segment_area(struct lv_segment *seg, uint32_t s, void release_lv_segment_area(struct lv_segment *seg, uint32_t s,

4
lib/metadata/lv_manip.c
View File

@ -333,7 +333,7 @@ int set_lv_segment_area_pv(struct lv_segment *seg, uint32_t area_num,
*/ */
int set_lv_segment_area_lv(struct lv_segment *seg, uint32_t area_num, int set_lv_segment_area_lv(struct lv_segment *seg, uint32_t area_num,
struct logical_volume *lv, uint32_t le, struct logical_volume *lv, uint32_t le,
uint32_t flags) uint64_t status)
{ {
log_very_verbose("Stack %s:%" PRIu32 "[%" PRIu32 "] on LV %s:%" PRIu32, log_very_verbose("Stack %s:%" PRIu32 "[%" PRIu32 "] on LV %s:%" PRIu32,
seg->lv->name, seg->le, area_num, lv->name, le); seg->lv->name, seg->le, area_num, lv->name, le);
@ -341,7 +341,7 @@ int set_lv_segment_area_lv(struct lv_segment *seg, uint32_t area_num,
seg->areas[area_num].type = AREA_LV; seg->areas[area_num].type = AREA_LV;
seg_lv(seg, area_num) = lv; seg_lv(seg, area_num) = lv;
seg_le(seg, area_num) = le; seg_le(seg, area_num) = le;
lv->status |= flags; lv->status |= status;
if (!add_seg_to_segs_using_this_lv(lv, seg)) if (!add_seg_to_segs_using_this_lv(lv, seg))
return_0; return_0;