diff options
| author | Alasdair Kergon <agk@redhat.com> | 2011-07-05 01:01:19 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2011-07-05 01:01:19 +0000 |
| commit | b5750a61f1bb96b5600b960fc7572e0cab76c867 (patch) | |
| tree | f8a4ae27e39f97513c08b6d90ec381df2bae2669 /lib/activate | |
| parent | 67d60b0365844003bb10434fb6302695eb6e6ac0 (diff) | |
| download | lvm2-b5750a61f1bb96b5600b960fc7572e0cab76c867.tar.gz lvm2-b5750a61f1bb96b5600b960fc7572e0cab76c867.tar.xz lvm2-b5750a61f1bb96b5600b960fc7572e0cab76c867.zip | |
Fix conditions using no_merging: only those using lv_is_merging_cow() should
have been converted, not pure lv_is_cow ones.
(Merging has no impact on how the pre-merged cow segment itself is loaded.)
Diffstat (limited to 'lib/activate')
| -rw-r--r-- | lib/activate/dev_manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 7a985e57..04eb1244 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -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)) |