shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

Fix whitespace in linear target line to fix identical table line detection.

Browse Source 
(only tested with linear so far)
This commit is contained in:
Alasdair Kergon 2009-07-07 16:36:05 +00:00
parent 6cf4278659
commit 609faae9a5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libdm/libdm-deptree.c
View File

@ -1252,12 +1252,16 @@ static int _emit_areas_line(struct dm_task *dmt __attribute((unused)),
{ {
struct seg_area *area; struct seg_area *area;
char devbuf[DM_FORMAT_DEV_BUFSIZE]; char devbuf[DM_FORMAT_DEV_BUFSIZE];
unsigned first_time = 1;
dm_list_iterate_items(area, &seg->areas) { dm_list_iterate_items(area, &seg->areas) {
if (!_build_dev_string(devbuf, sizeof(devbuf), area->dev_node)) if (!_build_dev_string(devbuf, sizeof(devbuf), area->dev_node))
return_0; return_0;
EMIT_PARAMS(*pos, " %s %" PRIu64, devbuf, area->offset); EMIT_PARAMS(*pos, "%s%s %" PRIu64, first_time ? "" : " ",
devbuf, area->offset);
first_time = 0;
} }
return 1; return 1;
@ -1320,7 +1324,7 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
if ((seg->flags & DM_BLOCK_ON_ERROR)) if ((seg->flags & DM_BLOCK_ON_ERROR))
EMIT_PARAMS(pos, " block_on_error"); EMIT_PARAMS(pos, " block_on_error");
EMIT_PARAMS(pos, " %u", seg->mirror_area_count); EMIT_PARAMS(pos, " %u ", seg->mirror_area_count);
break; break;
case SEG_SNAPSHOT: case SEG_SNAPSHOT:
@ -1337,10 +1341,10 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
EMIT_PARAMS(pos, "%s", originbuf); EMIT_PARAMS(pos, "%s", originbuf);
break; break;
case SEG_STRIPED: case SEG_STRIPED:
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_CRYPT: case SEG_CRYPT:
EMIT_PARAMS(pos, "%s%s%s%s%s %s %" PRIu64, seg->cipher, EMIT_PARAMS(pos, "%s%s%s%s%s %s %" PRIu64 " ", seg->cipher,
seg->chainmode ? "-" : "", seg->chainmode ?: "", seg->chainmode ? "-" : "", seg->chainmode ?: "",
seg->iv ? "-" : "", seg->iv ?: "", seg->key, seg->iv ? "-" : "", seg->iv ?: "", seg->key,
seg->iv_offset != DM_CRYPT_IV_DEFAULT ? seg->iv_offset != DM_CRYPT_IV_DEFAULT ?