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

Fix vg_read() error paths to properly release upon vg_read_error().

Browse Source 
Fix vg_read() error paths to properly release upon vg_read_error().
Note that in the iterator paths (process_each_*()), we release
inside the iterator so no individual cleanup is needed.  However there
are a number of other places we missed the cleanup.  Proper cleanup
when vg_read_error() is true should be calling vg_release(vg), since
there should be no locks held if we get an error (except in certain
special cases, which IMO we should work to remove from the code).

Unfortunately the testsuite is unable to detect these types of memory
leaks.  Most of them can be easily seen if you try an operation
(e.g. lvcreate) with a volume group that does not exist.  Error
message looks like this:
  Volume group "vg2" not found
  You have a memory leak (not released memory pool):
   [0x1975eb8]
  You have a memory leak (not released memory pool):
   [0x1975eb8]


Author: Dave Wysochanski <dwysocha@redhat.com>
This commit is contained in:
Dave Wysochanski 2009-07-07 01:18:35 +00:00
parent 34fe80f9d9
commit 836326f31e
12 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/lvcreate.c
View File

@ -995,8 +995,10 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv)
log_verbose("Finding volume group \"%s\"", lp.vg_name);
vg = vg_read_for_update(cmd, lp.vg_name, NULL, 0);
if (vg_read_error(vg))
if (vg_read_error(vg)) {
vg_release(vg);
return ECMD_FAILED;
}
if (!_lvcreate(cmd, vg, &lp))
r = ECMD_FAILED;

4
tools/lvrename.c
View File

@ -103,8 +103,10 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)
log_verbose("Checking for existing volume group \"%s\"", vg_name);
vg = vg_read_for_update(cmd, vg_name, NULL, 0);
if (vg_read_error(vg))
if (vg_read_error(vg)) {
vg_release(vg);
return ECMD_FAILED;
}
if (!(lvl = find_lv_in_vg(vg, lv_name_old))) {
log_error("Existing logical volume \"%s\" not found in "

1
tools/lvresize.c
View File

@ -673,6 +673,7 @@ int lvresize(struct cmd_context *cmd, int argc, char **argv)
log_verbose("Finding volume group %s", lp.vg_name);
vg = vg_read_for_update(cmd, lp.vg_name, NULL, 0);
if (vg_read_error(vg)) {
vg_release(vg);
stack;
return ECMD_FAILED;
}

1
tools/polldaemon.c
View File

@ -150,6 +150,7 @@ static int _wait_for_single_mirror(struct cmd_context *cmd, const char *name, co
/* Locks the (possibly renamed) VG again */
vg = parms->poll_fns->get_copy_vg(cmd, name, uuid);
if (vg_read_error(vg)) {
vg_release(vg);
log_error("ABORTING: Can't reread VG for %s", name);
/* What more could we do here? */
return 0;

4
tools/pvchange.c
View File

@ -58,8 +58,10 @@ static int _pvchange_single(struct cmd_context *cmd, struct physical_volume *pv,
log_verbose("Finding volume group %s of physical volume %s",
vg_name, pv_name);
vg = vg_read_for_update(cmd, vg_name, NULL, 0);
if (vg_read_error(vg))
if (vg_read_error(vg)) {
vg_release(vg);
return_0;
}
if (!(pvl = find_pv_in_vg(vg, pv_name))) {
log_error

1
tools/pvmove.c
View File

@ -387,6 +387,7 @@ static int _set_up_pvmove(struct cmd_context *cmd, const char *pv_name,
vg = _get_vg(cmd, pv_vg_name(pv));
if (vg_read_error(vg)) {
vg_release(vg);
stack;
return ECMD_FAILED;
}

4
tools/pvresize.c
View File

@ -100,7 +100,7 @@ static int _pv_resize_single(struct cmd_context *cmd,
log_error("%s: Couldn't get size.", pv_name);
goto bad;
}
if (new_size) {
if (new_size > size)
log_warn("WARNING: %s: Overriding real size. "
@ -127,7 +127,7 @@ static int _pv_resize_single(struct cmd_context *cmd,
if (vg) {
pv->size -= pv_pe_start(pv);
new_pe_count = pv_size(pv) / vg->extent_size;
if (!new_pe_count) {
log_error("%s: Size must leave space for at "
"least one physical extent of "

1
tools/toollib.c
View File

@ -354,6 +354,7 @@ int process_each_segment_in_pv(struct cmd_context *cmd,
vg = vg_read(cmd, vg_name, NULL, 0);
if (vg_read_error(vg)) {
vg_release(vg);
log_error("Skipping volume group %s", vg_name);
return ECMD_FAILED;
}

1
tools/vgextend.c
View File

@ -45,6 +45,7 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv)
vg = vg_read_for_update(cmd, vg_name, NULL,
READ_REQUIRE_RESIZEABLE | LOCK_NONBLOCKING);
if (vg_read_error(vg)) {
vg_release(vg);
unlock_vg(cmd, VG_ORPHANS);
return ECMD_FAILED;
}

7
tools/vgmerge.c
View File

@ -29,13 +29,16 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to,
log_verbose("Checking for volume group \"%s\"", vg_name_to);
vg_to = vg_read_for_update(cmd, vg_name_to, NULL, 0);
if (vg_read_error(vg_to))
return ECMD_FAILED;
if (vg_read_error(vg_to)) {
vg_release(vg_to);
return ECMD_FAILED;
}
log_verbose("Checking for volume group \"%s\"", vg_name_from);
vg_from = vg_read_for_update(cmd, vg_name_from, NULL,
LOCK_NONBLOCKING);
if (vg_read_error(vg_from)) {
vg_release(vg_from);
unlock_and_release_vg(cmd, vg_to, vg_name_to);
return ECMD_FAILED;
}

4
tools/vgrename.c
View File

@ -73,8 +73,10 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path,
/* FIXME we used to print an error about EXPORTED, but proceeded
nevertheless. */
vg = vg_read_for_update(cmd, vg_name_old, vgid, READ_ALLOW_EXPORTED);
if (vg_read_error(vg))
if (vg_read_error(vg)) {
vg_release(vg);
return_0;
}
if (lvs_in_vg_activated_by_uuid_only(vg)) {
unlock_and_release_vg(cmd, vg, vg_name_old);

4
tools/vgsplit.c
View File

@ -317,8 +317,10 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv)
vg_from = vg_read_for_update(cmd, vg_name_from, NULL,
READ_REQUIRE_RESIZEABLE);
if (vg_read_error(vg_from))
if (vg_read_error(vg_from)) {
vg_release(vg_from);
return ECMD_FAILED;
}
log_verbose("Checking for new volume group \"%s\"", vg_name_to);
/*