fix allocation handle memory pool leak in mirror code
PATCH 1/1 fix allocation handle memory pool leak in mirror code
Fix alloc memory pool leak.
Call the alloc_destory call always after finishing operation with handle otherwise it will leak a memory pool.
Also fix return code in lv_extend.
Signed-off-by Milan Broz <[email protected]>
--- lib/metadata/lv_manip.c | 14 +++++--------- lib/metadata/mirror.c | 22 +++++++++++++++------- 2 files changed, 20 insertions(+), 16 deletions(-)
lib/metadata/lv_manip.c +5 -9
@@ -1608,16 +1608,12 @@ int lv_extend(struct logical_volume *lv, extents, allocatable_pvs, alloc, NULL))) return_0; -if (mirrors <2 ) { -if (!lv_add_segment (ah,0 , ah->area_count, lv, segtype, stripe_size, - status,0 ,NULL )) - goto_out; - }else { -if (!_lv_extend_mirror (ah, lv, extents,0 )) - return_0; - } +if (mirrors <2 ) + r =lv_add_segment (ah,0 , ah->area_count, lv, segtype, + stripe_size, status,0 ,NULL ); +else + r =_lv_extend_mirror (ah, lv, extents,0 ); - out:alloc_destroy (ah);return r; }
lib/metadata/mirror.c +15 -7
@@ -1160,6 +1160,7 @@ int add_mirrors_to_segments(struct cmd_context *cmd, struct logical_volume *lv,const struct segment_type *segtype;struct dm_list *parallel_areas;uint32_t adjusted_region_size; +int r =1 ;if (!(parallel_areas =build_parallel_areas_from_lv (cmd, lv))) return_0;
@@ -1180,10 +1181,11 @@ int add_mirrors_to_segments(struct cmd_context *cmd, struct logical_volume *lv,if (!lv_add_mirror_areas (ah, lv,0 , adjusted_region_size)) {log_error ("Failed to add mirror areas to %s" , lv->name); -return 0 ; + r =0 ; } -return 1 ; +alloc_destroy (ah); +return r; }/*
@@ -1349,6 +1351,7 @@ int add_mirror_log(struct cmd_context *cmd, struct logical_volume *lv,int in_sync;struct logical_volume *log_lv;struct lvinfo info; +int r =0 ;/* Unimplemented features */ if (log_count >1 ) {
@@ -1404,13 +1407,15 @@ int add_mirror_log(struct cmd_context *cmd, struct logical_volume *lv,if (!(log_lv =_set_up_mirror_log (cmd, ah, lv, log_count, region_size, alloc, in_sync))) - return_0; + goto_out;if (!attach_mirror_log (first_seg (lv), log_lv)) - return_0; + goto_out; + r =1 ; +out:alloc_destroy (ah); -return 1 ; +return r; }/*
@@ -1455,8 +1460,10 @@ int add_mirror_images(struct cmd_context *cmd, struct logical_volume *lv,*/ if (log_count && !(log_lv =_set_up_mirror_log (cmd, ah, lv, log_count, region_size, - alloc,mirror_in_sync ()))) - return_0; + alloc,mirror_in_sync ()))) { + stack; + goto out_remove_imgs; + }/* The log initialization involves vg metadata commit. So from here on, if failure occurs, the log must be explicitly
@@ -1503,6 +1510,7 @@ int add_mirror_images(struct cmd_context *cmd, struct logical_volume *lv, "abandoned log LV before retrying."); out_remove_imgs: +alloc_destroy (ah);return 0 ; }
PATCH 1/1 fix allocation handle memory pool leak in mirror code
Quoted 1 line
Signed-off-by Milan Broz <[email protected]>
Acked-by Petr Ro?kai <[email protected]>
Quoted 16 lines
lib/metadata/lv_manip.c +0
-8@@ -1608,16 +1608,12 @@ int lv_extend(struct logical_volume *lv, extents, allocatable_pvs, alloc, NULL))) return_0; -if (mirrors <2 ) { -if (!lv_add_segment (ah,0 , ah->area_count, lv, segtype, stripe_size, - status,0 ,NULL )) - goto_out; - }else { -if (!_lv_extend_mirror (ah, lv, extents,0 )) - return_0; - }
lib/metadata/lv_manip.c int lv_extend(struct logical_volume *lv, · line 1619
Quoted 10 lines
lib/metadata/lv_manip.c +5
-1+if (mirrors <2 ) + r =lv_add_segment (ah,0 , ah->area_count, lv, segtype, + stripe_size, status,0 ,NULL ); +else + r =_lv_extend_mirror (ah, lv, extents,0 ); - out:alloc_destroy (ah);return r; }
Check.
Quoted 14 lines
lib/metadata/mirror.c +1
-0@@ -1160,6 +1160,7 @@ int add_mirrors_to_segments(struct cmd_context *cmd, struct logical_volume *lv,const struct segment_type *segtype;struct dm_list *parallel_areas;uint32_t adjusted_region_size; +int r =1 ;if (!(parallel_areas =build_parallel_areas_from_lv (cmd, lv))) return_0;@@ -1180,10 +1181,11 @@ int add_mirrors_to_segments(struct cmd_context *cmd, struct logical_volume *lv,
lib/metadata/mirror.c int add_mirrors_to_segments(struct cmd_context *cmd, struct logical_volume *lv, · line 1189
Quoted 10 lines
lib/metadata/mirror.c +3
-2if (!lv_add_mirror_areas (ah, lv,0 , adjusted_region_size)) {log_error ("Failed to add mirror areas to %s" , lv->name); -return 0 ; + r =0 ; } -return 1 ; +alloc_destroy (ah); +return r; }
Check.
Quoted 16 lines
lib/metadata/mirror.c +2
-1/* @@ -1349,6 +1351,7 @@ int add_mirror_log(struct cmd_context *cmd, struct logical_volume *lv,int in_sync;struct logical_volume *log_lv;struct lvinfo info; +int r =0 ;/* Unimplemented features */ if (log_count >1 ) {@@ -1404,13 +1407,15 @@ int add_mirror_log(struct cmd_context *cmd, struct logical_volume *lv,if (!(log_lv =_set_up_mirror_log (cmd, ah, lv, log_count, region_size, alloc, in_sync))) - return_0; + goto_out;
lib/metadata/mirror.c int add_mirror_log(struct cmd_context *cmd, struct logical_volume *lv, · line 1419
Quoted 10 lines
lib/metadata/mirror.c +4
-2if (!attach_mirror_log (first_seg (lv), log_lv)) - return_0; + goto_out; + r =1 ; +out:alloc_destroy (ah); -return 1 ; +return r; }
Check.
Quoted 15 lines
lib/metadata/mirror.c +4
-2/* @@ -1455,8 +1460,10 @@ int add_mirror_images(struct cmd_context *cmd, struct logical_volume *lv,*/ if (log_count && !(log_lv =_set_up_mirror_log (cmd, ah, lv, log_count, region_size, - alloc,mirror_in_sync ()))) - return_0; + alloc,mirror_in_sync ()))) { + stack; + goto out_remove_imgs; + }/* The log initialization involves vg metadata commit. So from here on, if failure occurs, the log must be explicitly
lib/metadata/mirror.c int add_mirror_images(struct cmd_context *cmd, struct logical_volume *lv, · line 1515
Quoted 6 lines
lib/metadata/mirror.c +1
-0@@ -1503,6 +1510,7 @@ int add_mirror_images(struct cmd_context *cmd, struct logical_volume *lv, "abandoned log LV before retrying."); out_remove_imgs: +alloc_destroy (ah);return 0 ; }
Check.
Signature · 6 lines
Peter Rockai | me()mornfall!net | prockai()redhat!com
http://blog.mornfall.net | http://web.mornfall.net
"In My Egotistical Opinion, most people's C programs should be
indented six feet downward and covered with dirt."
-- Blair P. Houghton on the subject of C program indentation