1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

libdm: use uint64_t where possible in filemap routines

Use uint64_t where possible and explicit casts elsewhere to avoid
compiler warnings when converting between int, int64_t and
uint64_t.
This commit is contained in:
Bryn M. Reeves 2017-03-29 20:49:03 +01:00
parent b823646ace
commit c7e4b97abc

View File

@ -4511,8 +4511,9 @@ static int _stats_unmap_regions(struct dm_stats *dms, uint64_t group_id,
{ {
struct dm_stats_region *region = NULL; struct dm_stats_region *region = NULL;
struct dm_stats_group *group = NULL; struct dm_stats_group *group = NULL;
int64_t nr_kept, nr_old, i; uint64_t nr_kept, nr_old;
struct _extent ext; struct _extent ext;
int64_t i;
group = &dms->groups[group_id]; group = &dms->groups[group_id];
@ -4571,7 +4572,7 @@ static int _stats_unmap_regions(struct dm_stats *dms, uint64_t group_id,
log_very_verbose("Found " FMTu64 " new extents", log_very_verbose("Found " FMTu64 " new extents",
*count - nr_kept); *count - nr_kept);
return nr_kept; return (int) nr_kept;
out: out:
dm_pool_abandon_object(mem); dm_pool_abandon_object(mem);
return -1; return -1;
@ -4594,15 +4595,15 @@ static uint64_t *_stats_map_file_regions(struct dm_stats *dms, int fd,
uint64_t *count, int *regroup) uint64_t *count, int *regroup)
{ {
struct _extent *extents = NULL, *old_extents = NULL; struct _extent *extents = NULL, *old_extents = NULL;
uint64_t *regions = NULL, fail_region; uint64_t *regions = NULL, fail_region, i, num_bits;
struct dm_stats_group *group = NULL; struct dm_stats_group *group = NULL;
struct dm_pool *extent_mem = NULL; struct dm_pool *extent_mem = NULL;
struct _extent *old_ext; struct _extent *old_ext;
char *hist_arg = NULL; char *hist_arg = NULL;
int update, num_bits;
struct statfs fsbuf; struct statfs fsbuf;
int64_t nr_kept = 0, i; int64_t nr_kept = 0;
struct stat buf; struct stat buf;
int update;
update = _stats_group_id_present(dms, group_id); update = _stats_group_id_present(dms, group_id);