[PATCH 04/14] Refactor and add code for (lv) 'move_pv' get function.

Dave Wysochanski <[email protected]> writes:

> Signed-off-by: Dave Wysochanski <[email protected]>
Reviewed-By: Petr Rockai <[email protected]>

> diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
> index ae8a4fb..8f4c95a 100644
> --- a/lib/metadata/lv.c
> +++ b/lib/metadata/lv.c
> @@ -18,6 +18,21 @@
>  #include "activate.h"
>  #include "toolcontext.h"
>  
> +char *lv_move_pv_dup(struct dm_pool *mem, const struct logical_volume *lv)
> +{
> +	const char *name;
> +	struct lv_segment *seg;
> +
> +	dm_list_iterate_items(seg, &lv->segments) {
> +		if (!(seg->status & PVMOVE))
> +			continue;
> +		name = dev_name(seg_dev(seg, 0));
> +	}
> +	if (name)
> +		return dm_pool_strndup(mem, name, strlen(name) + 1);
> +	return NULL;
> +}

I believe that dev_name can't give you NULL and that there is only ever
a single matching device (even if there wasn't, giving first or last
shouldn't make any difference). So you can remove the "name" temporary
and just say

if (seg->status & PVMOVE)
   return dm_pool_strdup(mem, dev_name(seg_dev(seg, 0)))

in the loop, and return NULL after the loop. (Even if you prefer the one
you already have, changing strndup to strdup is a good idea, since doing
the above comes with no benefits, just downsides.)

> --- a/lib/metadata/lv.h
> +++ b/lib/metadata/lv.h
> @@ -54,5 +54,6 @@ char *lv_uuid_dup(const struct logical_volume *lv);
>  char *lv_tags_dup(const struct logical_volume *lv);
>  char *lv_path_dup(struct dm_pool *mem, const struct logical_volume *lv);
>  uint64_t lv_origin_size(const struct logical_volume *lv);
> +char *lv_move_pv_dup(struct dm_pool *mem, const struct logical_volume *lv);
>  
>  #endif

> --- a/lib/report/properties.c
> +++ b/lib/report/properties.c
> @@ -129,7 +129,7 @@ GET_LV_NUM_PROPERTY_FN(origin_size, lv_origin_size(lv))
>  #define _snap_percent_set _not_implemented_set
>  #define _copy_percent_get _not_implemented_get
>  #define _copy_percent_set _not_implemented_set
> -#define _move_pv_get _not_implemented_get
> +GET_LV_STR_PROPERTY_FN(move_pv, lv_move_pv_dup(lv->vg->vgmem, lv))
>  #define _move_pv_set _not_implemented_set
>  #define _convert_lv_get _not_implemented_get
>  #define _convert_lv_set _not_implemented_set

> --- a/lib/report/report.c
> +++ b/lib/report/report.c
> @@ -378,16 +378,11 @@ static int _movepv_disp(struct dm_report *rh, struct dm_pool *mem __attribute__(
>  {
>  	const struct logical_volume *lv = (const struct logical_volume *) data;
>  	const char *name;
> -	struct lv_segment *seg;
>  
> -	dm_list_iterate_items(seg, &lv->segments) {
> -		if (!(seg->status & PVMOVE))
> -			continue;
> -		name = dev_name(seg_dev(seg, 0));
> +	if (!(name = lv_move_pv_dup(mem, lv)))
> +		dm_report_field_set_value(field, "", NULL);
> +	else
>  		return dm_report_field_string(rh, field, &name);
> -	}
> -
> -	dm_report_field_set_value(field, "", NULL);
>  	return 1;
>  }
Ok.