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

snapshot: drop find_merging_snapshot

Browse Source 
Drop find_merging_snapshot() function. Use find_snapshot()
called after check for lv_is_merging_origin() which
is the commonly used code path - so we avoid duplicated
tests and potential risk of derefering NULL point
in unhandled error path.
This commit is contained in:
Zdenek Kabelac 2013-11-28 11:39:38 +01:00
parent 01c438a96c
commit 79991aa769
4 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/activate/dev_manager.c
View File

@ -2047,9 +2047,9 @@ static int _add_snapshot_merge_target_to_dtree(struct dev_manager *dm,
struct logical_volume *lv) struct logical_volume *lv)
{ {
const char *origin_dlid, *cow_dlid, *merge_dlid; const char *origin_dlid, *cow_dlid, *merge_dlid;
struct lv_segment *merging_snap_seg; struct lv_segment *merging_snap_seg = find_snapshot(lv);
if (!(merging_snap_seg = find_merging_snapshot(lv))) { if (!lv_is_merging_origin(lv)) {
log_error(INTERNAL_ERROR "LV %s is not merging snapshot.", lv->name); log_error(INTERNAL_ERROR "LV %s is not merging snapshot.", lv->name);
return 0; return 0;
} }
@ -2374,7 +2374,8 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
/* FIXME Seek a simpler way to lay out the snapshot-merge tree. */ /* FIXME Seek a simpler way to lay out the snapshot-merge tree. */
if (lv_is_origin(lv) && lv_is_merging_origin(lv) && !layer) { if (!layer && lv_is_merging_origin(lv)) {
seg = find_snapshot(lv);
/* /*
* Clear merge attributes if merge isn't currently possible: * Clear merge attributes if merge isn't currently possible:
* either origin or merging snapshot are open * either origin or merging snapshot are open
@ -2385,8 +2386,7 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
/* An activating merging origin won't have a node in the tree yet */ /* An activating merging origin won't have a node in the tree yet */
if (((dinfo = _cached_info(dm->mem, dtree, lv, NULL)) && if (((dinfo = _cached_info(dm->mem, dtree, lv, NULL)) &&
dinfo->open_count) || dinfo->open_count) ||
((dinfo = _cached_info(dm->mem, dtree, ((dinfo = _cached_info(dm->mem, dtree, seg->cow, NULL)) &&
find_merging_snapshot(lv)->cow, NULL)) &&
dinfo->open_count)) { dinfo->open_count)) {
/* FIXME Is there anything simpler to check for instead? */ /* FIXME Is there anything simpler to check for instead? */
if (!lv_has_target_type(dm->mem, lv, NULL, "snapshot-merge")) if (!lv_has_target_type(dm->mem, lv, NULL, "snapshot-merge"))
@ -2445,7 +2445,7 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
return_0; return_0;
if (!laopts->no_merging && lv_is_merging_origin(lv)) { if (!laopts->no_merging && lv_is_merging_origin(lv)) {
if (!_add_new_lv_to_dtree(dm, dtree, if (!_add_new_lv_to_dtree(dm, dtree,
find_merging_snapshot(lv)->cow, laopts, "cow")) find_snapshot(lv)->cow, laopts, "cow"))
return_0; return_0;
/* /*
* Must also add "real" LV for use when * Must also add "real" LV for use when

2
lib/metadata/metadata-exported.h
View File

@ -882,8 +882,6 @@ int lv_is_visible(const struct logical_volume *lv);
int pv_is_in_vg(struct volume_group *vg, struct physical_volume *pv); int pv_is_in_vg(struct volume_group *vg, struct physical_volume *pv);
struct lv_segment *find_merging_snapshot(const struct logical_volume *origin);
/* Given a cow LV, return return the snapshot lv_segment that uses it */ /* Given a cow LV, return return the snapshot lv_segment that uses it */
struct lv_segment *find_snapshot(const struct logical_volume *lv); struct lv_segment *find_snapshot(const struct logical_volume *lv);

11
lib/metadata/snapshot_manip.c
View File

@ -100,14 +100,6 @@ int lv_is_merging_origin(const struct logical_volume *origin)
return (origin->status & MERGING) ? 1 : 0; return (origin->status & MERGING) ? 1 : 0;
} }
struct lv_segment *find_merging_snapshot(const struct logical_volume *origin)
{
if (!lv_is_merging_origin(origin))
return NULL;
return find_snapshot(origin);
}
int lv_is_merging_cow(const struct logical_volume *snapshot) int lv_is_merging_cow(const struct logical_volume *snapshot)
{ {
/* checks lv_segment's status to see if cow is merging */ /* checks lv_segment's status to see if cow is merging */
@ -233,7 +225,8 @@ int vg_remove_snapshot(struct logical_volume *cow)
dm_list_del(&cow->snapshot->origin_list); dm_list_del(&cow->snapshot->origin_list);
origin->origin_count--; origin->origin_count--;
if (find_merging_snapshot(origin) == find_snapshot(cow)) { if (lv_is_merging_origin(origin) &&
(find_snapshot(origin) == find_snapshot(cow))) {
clear_snapshot_merge(origin); clear_snapshot_merge(origin);
/* /*
* preload origin IFF "snapshot-merge" target is active * preload origin IFF "snapshot-merge" target is active

9
tools/lvconvert.c
View File

@ -650,8 +650,9 @@ static int _finish_lvconvert_merge(struct cmd_context *cmd,
struct logical_volume *lv, struct logical_volume *lv,
struct dm_list *lvs_changed __attribute__((unused))) struct dm_list *lvs_changed __attribute__((unused)))
{ {
struct lv_segment *snap_seg = find_merging_snapshot(lv); struct lv_segment *snap_seg = find_snapshot(lv);
if (!snap_seg) {
if (!lv_is_merging_origin(lv)) {
log_error("Logical volume %s has no merging snapshot.", lv->name); log_error("Logical volume %s has no merging snapshot.", lv->name);
return 0; return 0;
} }
@ -1899,8 +1900,8 @@ static int lvconvert_merge(struct cmd_context *cmd,
return 0; return 0;
} }
if (lv_is_merging_origin(origin)) { if (lv_is_merging_origin(origin)) {
log_error("Snapshot %s is already merging into the origin", log_error("Snapshot %s is already merging into the origin.",
find_merging_snapshot(origin)->cow->name); find_snapshot(origin)->cow->name);
return 0; return 0;
} }
if (lv_is_virtual_origin(origin)) { if (lv_is_virtual_origin(origin)) {