shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

Drop pool memory allocated in lv_has_target_type

Browse Source 
Remove FIXMES - there should not be any pool free call since
the memory pool is from device manager, and pool is detroyed
after the operation, so doing extra free here would not help here.

However lv_has_target_type() is using cmd mempool so here the extra
call for dm_pool_free makes sence.
This commit is contained in:
Zdenek Kabelac 2011-11-18 19:42:03 +00:00
parent 749c2dc4ab
commit 647c8edf82
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.89 - Version 2.02.89 -
================================== ==================================
Drop pool memory allocated within lv_has_target_type().
Reduce stack allocation of some PATH_MAX sized char buffers. Reduce stack allocation of some PATH_MAX sized char buffers.
Unlock memory before writing metadata. Unlock memory before writing metadata.
Add query before removing snapshots when inactive snapshot origin is removed. Add query before removing snapshots when inactive snapshot origin is removed.

11
lib/activate/dev_manager.c
View File

@ -411,7 +411,7 @@ int lv_has_target_type(struct dm_pool *mem, struct logical_volume *lv,
if (!(dmt = _setup_task(NULL, dlid, 0, if (!(dmt = _setup_task(NULL, dlid, 0,
DM_DEVICE_STATUS, 0, 0))) DM_DEVICE_STATUS, 0, 0)))
return_0; goto_bad;
if (!dm_task_no_open_count(dmt)) if (!dm_task_no_open_count(dmt))
log_error("Failed to disable open_count"); log_error("Failed to disable open_count");
@ -433,8 +433,11 @@ int lv_has_target_type(struct dm_pool *mem, struct logical_volume *lv,
} }
} while (next); } while (next);
out: out:
dm_task_destroy(dmt); dm_task_destroy(dmt);
bad:
dm_pool_free(mem, dlid);
return r; return r;
} }
@ -737,8 +740,6 @@ int dev_manager_snapshot_percent(struct dev_manager *dm,
NULL, fail_if_percent_unsupported))) NULL, fail_if_percent_unsupported)))
return_0; return_0;
/* FIXME dm_pool_free ? */
/* If the snapshot isn't available, percent will be -1 */ /* If the snapshot isn't available, percent will be -1 */
return 1; return 1;
} }
@ -760,8 +761,6 @@ int dev_manager_mirror_percent(struct dev_manager *dm,
if (!(name = dm_build_dm_name(dm->mem, lv->vg->name, lv->name, layer))) if (!(name = dm_build_dm_name(dm->mem, lv->vg->name, lv->name, layer)))
return_0; return_0;
/* FIXME dm_pool_free ? */
if (!(dlid = build_dm_uuid(dm->mem, lv->lvid.s, layer))) { if (!(dlid = build_dm_uuid(dm->mem, lv->lvid.s, layer))) {
log_error("dlid build failed for %s", lv->name); log_error("dlid build failed for %s", lv->name);
return 0; return 0;