shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

device_mapper: simplify line emitter checking

Browse Source
This commit is contained in:
Zdenek Kabelac 2021-02-10 15:22:39 +01:00
parent a383586177
commit 4b371246f5
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
device_mapper/libdm-deptree.c
View File

@ -2382,7 +2382,7 @@ static int _mirror_emit_segment_line(struct dm_task *dmt, struct load_segment *s
EMIT_PARAMS(pos, " %u ", seg->mirror_area_count); EMIT_PARAMS(pos, " %u ", seg->mirror_area_count);
if (_emit_areas_line(dmt, seg, params, paramsize, &pos) <= 0) if (!_emit_areas_line(dmt, seg, params, paramsize, &pos))
return_0; return_0;
if (handle_errors) if (handle_errors)
@ -2584,7 +2584,7 @@ static int _raid_emit_segment_line(struct dm_task *dmt, uint32_t major,
/* Print number of metadata/data device pairs */ /* Print number of metadata/data device pairs */
EMIT_PARAMS(pos, " %u", area_count); EMIT_PARAMS(pos, " %u", area_count);
if (_emit_areas_line(dmt, seg, params, paramsize, &pos) <= 0) if (!_emit_areas_line(dmt, seg, params, paramsize, &pos))
return_0; return_0;
return 1; return 1;
@ -2927,7 +2927,6 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
size_t paramsize) size_t paramsize)
{ {
int pos = 0; int pos = 0;
int r;
int target_type_is_raid = 0; int target_type_is_raid = 0;
char originbuf[DM_FORMAT_DEV_BUFSIZE], cowbuf[DM_FORMAT_DEV_BUFSIZE]; char originbuf[DM_FORMAT_DEV_BUFSIZE], cowbuf[DM_FORMAT_DEV_BUFSIZE];
@ -2938,8 +2937,7 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
break; break;
case SEG_MIRRORED: case SEG_MIRRORED:
/* Mirrors are pretty complicated - now in separate function */ /* Mirrors are pretty complicated - now in separate function */
r = _mirror_emit_segment_line(dmt, seg, params, paramsize); if (!_mirror_emit_segment_line(dmt, seg, params, paramsize))
if (!r)
return_0; return_0;
break; break;
case SEG_SNAPSHOT: case SEG_SNAPSHOT:
@ -2960,7 +2958,7 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
EMIT_PARAMS(pos, "%u %u ", seg->area_count, seg->stripe_size); EMIT_PARAMS(pos, "%u %u ", seg->area_count, seg->stripe_size);
break; break;
case SEG_VDO: case SEG_VDO:
if (!(r = _vdo_emit_segment_line(dmt, seg, params, paramsize))) if (!_vdo_emit_segment_line(dmt, seg, params, paramsize))
return_0; return_0;
break; break;
case SEG_CRYPT: case SEG_CRYPT:
@ -2989,9 +2987,8 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
case SEG_RAID6_LA_6: case SEG_RAID6_LA_6:
case SEG_RAID6_RA_6: case SEG_RAID6_RA_6:
target_type_is_raid = 1; target_type_is_raid = 1;
r = _raid_emit_segment_line(dmt, major, minor, seg, seg_start, if (!_raid_emit_segment_line(dmt, major, minor, seg, seg_start,
params, paramsize); params, paramsize))
if (!r)
return_0; return_0;
break; break;
@ -3032,10 +3029,9 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
case SEG_CRYPT: case SEG_CRYPT:
case SEG_LINEAR: case SEG_LINEAR:
case SEG_STRIPED: case SEG_STRIPED:
if ((r = _emit_areas_line(dmt, seg, params, paramsize, &pos)) <= 0) { if (!_emit_areas_line(dmt, seg, params, paramsize, &pos))
stack; return_0;
return r;
}
if (!params[0]) { if (!params[0]) {
log_error("No parameters supplied for %s target " log_error("No parameters supplied for %s target "
"%u:%u.", _dm_segtypes[seg->type].target, "%u:%u.", _dm_segtypes[seg->type].target,

2
device_mapper/libdm-report.c
View File

@ -492,7 +492,7 @@ static int _report_field_string_list(struct dm_report *rh,
delimiter = ","; delimiter = ",";
delimiter_len = strlen(delimiter); delimiter_len = strlen(delimiter);
i = pos = len = 0; i = pos = 0;
dm_list_iterate_items(sl, data) { dm_list_iterate_items(sl, data) {
arr[i].str = sl->str; arr[i].str = sl->str;
if (!sort) { if (!sort) {