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

gcc-fanalyzer: add extra check for origin_from_cow

Browse Source 
Make analyzer work easier with explicit check for internal error.
This commit is contained in:
Zdenek Kabelac 2021-09-18 22:04:54 +02:00
parent 93d565eda9
commit 3e21c8524e
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/metadata/snapshot_manip.c
View File

@ -111,13 +111,18 @@ int cow_has_min_chunks(const struct volume_group *vg, uint32_t cow_extents, uint
int lv_is_cow_covering_origin(const struct logical_volume *lv) int lv_is_cow_covering_origin(const struct logical_volume *lv)
{ {
return lv_is_cow(lv) && const struct logical_volume *origin;
(lv->size >= _cow_max_size(lv->vg->cmd, origin_from_cow(lv)->size,
find_snapshot(lv)->chunk_size)); return (lv_is_cow(lv) &&
(origin = origin_from_cow(lv)) &&
(lv->size >= _cow_max_size(lv->vg->cmd, origin->size,
find_snapshot(lv)->chunk_size)));
} }
int lv_is_visible(const struct logical_volume *lv) int lv_is_visible(const struct logical_volume *lv)
{ {
const struct logical_volume *origin;
if (lv_is_historical(lv)) if (lv_is_historical(lv))
return 1; return 1;
@ -125,13 +130,16 @@ int lv_is_visible(const struct logical_volume *lv)
return 0; return 0;
if (lv_is_cow(lv)) { if (lv_is_cow(lv)) {
if (lv_is_virtual_origin(origin_from_cow(lv))) if (!(origin = origin_from_cow(lv)))
return_0;
if (lv_is_virtual_origin(origin))
return 1; return 1;
if (lv_is_merging_cow(lv)) if (lv_is_merging_cow(lv))
return 0; return 0;
return lv_is_visible(origin_from_cow(lv)); return lv_is_visible(origin);
} }
return lv->status & VISIBLE_LV ? 1 : 0; return lv->status & VISIBLE_LV ? 1 : 0;
@ -160,6 +168,9 @@ struct logical_volume *origin_from_cow(const struct logical_volume *lv)
{ {
if (lv->snapshot) if (lv->snapshot)
return lv->snapshot->origin; return lv->snapshot->origin;
log_debug(INTERNAL_ERROR "Cannot get origin from snapshot %s.",
display_lvname(lv));
return NULL; return NULL;
} }
@ -286,8 +297,15 @@ int vg_add_snapshot(struct logical_volume *origin,
int vg_remove_snapshot(struct logical_volume *cow) int vg_remove_snapshot(struct logical_volume *cow)
{ {
struct logical_volume *origin = origin_from_cow(cow); struct logical_volume *origin;
int is_origin_active = lv_is_active(origin); int is_origin_active;
if (!lv_is_cow(cow))
return_0;
origin = origin_from_cow(cow);
is_origin_active = lv_is_active(origin);
if (is_origin_active && if (is_origin_active &&
lv_is_virtual_origin(origin)) { lv_is_virtual_origin(origin)) {

7
tools/lvconvert.c
View File

@ -2142,11 +2142,16 @@ static int _lvconvert_merge_old_snapshot(struct cmd_context *cmd,
struct logical_volume **lv_to_poll) struct logical_volume **lv_to_poll)
{ {
int merge_on_activate = 0; int merge_on_activate = 0;
struct logical_volume *origin = origin_from_cow(lv); struct logical_volume *origin;
struct lv_segment *snap_seg = find_snapshot(lv); struct lv_segment *snap_seg = find_snapshot(lv);
struct lvinfo info; struct lvinfo info;
dm_percent_t snap_percent; dm_percent_t snap_percent;
if (!snap_seg)
return_0;
origin = origin_from_cow(lv);
/* Check if merge is possible */ /* Check if merge is possible */
if (lv_is_merging_origin(origin)) { if (lv_is_merging_origin(origin)) {
log_error("Cannot merge snapshot %s into the origin %s " log_error("Cannot merge snapshot %s into the origin %s "