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

libdm: allow truncated files in dm_stats_update_regions_from_fd()

Browse Source 
It's not an error to attempt to update regions from an fd that has
been truncated (or otherwise no longer has any allocated extents):
in this case, the call should remove all regions corresponding to
the group, and return an empty region table.
This commit is contained in:
Bryn M. Reeves 2017-06-07 19:21:10 +01:00
parent 37cd8f9678
commit 744f2920db
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.141 - Version 1.02.141 -
=============================== ===============================
Accept truncated files in calls to dm_stats_update_regions_from_fd().
Restore Warning by 5% increment when thin-pool is over 80% (1.02.138). Restore Warning by 5% increment when thin-pool is over 80% (1.02.138).
Version 1.02.140 - 3rd May 2017 Version 1.02.140 - 3rd May 2017

22
libdm/libdm-stats.c
View File

@ -4466,6 +4466,7 @@ static struct _extent *_stats_get_extents_for_file(struct dm_pool *mem, int fd,
return extents; return extents;
bad: bad:
*count = 0;
dm_pool_abandon_object(mem); dm_pool_abandon_object(mem);
dm_free(buf); dm_free(buf);
return NULL; return NULL;
@ -4536,7 +4537,7 @@ static int _stats_unmap_regions(struct dm_stats *dms, uint64_t group_id,
region = &dms->regions[i]; region = &dms->regions[i];
nr_old++; nr_old++;
if (_find_extent(*count, extents, if (extents && _find_extent(*count, extents,
region->start, region->len)) { region->start, region->len)) {
ext.start = region->start; ext.start = region->start;
ext.len = region->len; ext.len = region->len;
@ -4653,11 +4654,12 @@ static uint64_t *_stats_map_file_regions(struct dm_stats *dms, int fd,
* causing complications in the error path. * causing complications in the error path.
*/ */
if (!(extent_mem = dm_pool_create("extents", sizeof(*extents)))) if (!(extent_mem = dm_pool_create("extents", sizeof(*extents))))
return_0; return_NULL;
if (!(extents = _stats_get_extents_for_file(extent_mem, fd, count))) { if (!(extents = _stats_get_extents_for_file(extent_mem, fd, count))) {
dm_pool_destroy(extent_mem); log_very_verbose("No extents found in fd %d", fd);
return_0; if (!update)
goto out;
} }
if (update) { if (update) {
@ -4734,7 +4736,10 @@ static uint64_t *_stats_map_file_regions(struct dm_stats *dms, int fd,
if (bounds) if (bounds)
dm_free(hist_arg); dm_free(hist_arg);
/* the extent table will be empty if the file has been truncated. */
if (extents)
dm_pool_free(extent_mem, extents); dm_pool_free(extent_mem, extents);
dm_pool_destroy(extent_mem); dm_pool_destroy(extent_mem);
return regions; return regions;
@ -4755,12 +4760,6 @@ out_remove:
*count = 0; *count = 0;
out: out:
/*
* The table of file extents in 'extents' is always built, so free
* it explicitly: this will also free any 'old_extents' table that
* was later allocated from the 'extent_mem' pool by this function.
*/
dm_pool_free(extent_mem, extents);
dm_pool_destroy(extent_mem); dm_pool_destroy(extent_mem);
dm_free(hist_arg); dm_free(hist_arg);
dm_free(regions); dm_free(regions);
@ -4872,7 +4871,8 @@ uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd,
if (!dm_stats_list(dms, NULL)) if (!dm_stats_list(dms, NULL))
goto bad; goto bad;
if (regroup) /* regroup if there are regions to group */
if (regroup && (*regions != DM_STATS_REGION_NOT_PRESENT))
if (!_stats_group_file_regions(dms, regions, count, alias)) if (!_stats_group_file_regions(dms, regions, count, alias))
goto bad; goto bad;