summaryrefslogtreecommitdiffstats
path: root/lib/format1/import-extents.c
diff options
context:
space:
mode:
authorAlasdair Kergon <agk@redhat.com>2002-04-24 18:20:51 +0000
committerAlasdair Kergon <agk@redhat.com>2002-04-24 18:20:51 +0000
commit25b733809adcd2f6a8f288c100085068094dcc8a (patch)
treede7aea488a1c717d589134b324c664ba4aa505a7 /lib/format1/import-extents.c
parentf06bdc437d7eab9569f80ba40cbfca55ffa27104 (diff)
downloadlvm2-25b733809adcd2f6a8f288c100085068094dcc8a.tar.gz
lvm2-25b733809adcd2f6a8f288c100085068094dcc8a.tar.xz
lvm2-25b733809adcd2f6a8f288c100085068094dcc8a.zip
Merge with text format branch.
Lots of changes/very little testing so far => there'll be bugs! Use 'vgcreate -M text' to create a volume group with its metadata stored in text files. Text format metadata changes should be reasonably atomic, with a (basic) automatic recovery mechanism if the system crashes while a change is in progress. Add a metadata section to lvm.conf to specify multiple directories if you want (recommended) to keep multiple copies of the metadata (eg on different filesystems). e.g. metadata { dirs = ["/etc/lvm/metadata1","/usr/local/lvm/metadata2"] } Plenty of refinements still in the pipeline.
Diffstat (limited to 'lib/format1/import-extents.c')
-rw-r--r--lib/format1/import-extents.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/format1/import-extents.c b/lib/format1/import-extents.c
index 9e56e95a..84791b58 100644
--- a/lib/format1/import-extents.c
+++ b/lib/format1/import-extents.c
@@ -249,7 +249,7 @@ static int _check_stripe(struct lv_map *lvm, struct stripe_segment *seg,
*/
for (st = 0; st < seg->stripes; st++)
if ((lvm->map[le + st * len].pv != seg->area[st].pv) ||
- (lvm->map[le + st * len].pe != seg->area[st].pe + seg->len))
+ (lvm->map[le + st * len].pe != seg->area[st].pe + seg->len))
return 0;
return 1;
@@ -266,8 +266,7 @@ static int _read_stripes(struct pool *mem, struct lv_map *lvm)
if (lvm->lv->le_count % lvm->stripes) {
log_error("Number of stripes (%u) incompatible "
"with logical extent count (%u) for %s",
- lvm->stripes, lvm->lv->le_count,
- lvm->lv->name);
+ lvm->stripes, lvm->lv->le_count, lvm->lv->name);
}
len = lvm->lv->le_count / lvm->stripes;