shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-11 20:58:50 +03:00
Code Releases Activity

Fix conditions using no_merging: only those using lv_is_merging_cow() should

Browse Source 
have been converted, not pure lv_is_cow ones.
(Merging has no impact on how the pre-merged cow segment itself is loaded.)
This commit is contained in:
Alasdair Kergon 2011-07-05 01:01:19 +00:00
parent 67d60b0365
commit b5750a61f1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/activate/dev_manager.c
View File

@ -1436,7 +1436,7 @@ static int _add_segment_to_dtree(struct dev_manager *dm,
}
if (!_add_new_lv_to_dtree(dm, dtree, seg->lv, laopts, "real"))
return_0;
} else if (!laopts->no_merging && lv_is_cow(seg->lv) && !layer) {
} else if (lv_is_cow(seg->lv) && !layer) {
if (!_add_new_lv_to_dtree(dm, dtree, seg->lv, laopts, "cow"))
return_0;
} else {
@ -1457,7 +1457,7 @@ static int _add_segment_to_dtree(struct dev_manager *dm,
if (!_add_snapshot_merge_target_to_dtree(dm, dnode, seg->lv))
return_0;
}
} else if (!laopts->no_merging && lv_is_cow(seg->lv) && !layer) {
} else if (lv_is_cow(seg->lv) && !layer) {
if (!_add_snapshot_target_to_dtree(dm, dnode, seg->lv, laopts))
return_0;
} else if (!_add_target_to_dtree(dm, dnode, seg, laopts))