1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00

cache: restore origin only reload

Basically reverting commit 58a9f88b8c.
We can use origin_only  in case we are snapshot's origin,
as we do support this stack.

So when we are 'uncaching'  origin+snaps - we do need to reload only
origin and we do not need to play with snaps.
This commit is contained in:
Zdenek Kabelac 2017-06-23 17:05:24 +02:00
parent 63ecbcd1b7
commit 1bdcd156fd
2 changed files with 2 additions and 3 deletions

View File

@ -2,7 +2,6 @@ Version 2.02.172 -
=============================== ===============================
Do not lvdisplay --maps unset settings of cache pool. Do not lvdisplay --maps unset settings of cache pool.
Fix lvdisplay --maps for cache pool without policy settings. Fix lvdisplay --maps for cache pool without policy settings.
Avoid using origin_only manipulation with cached device.
Support aborting of flushing cache LV. Support aborting of flushing cache LV.
Reenable conversion of data and metadata thin-pool volumes to raid. Reenable conversion of data and metadata thin-pool volumes to raid.
Improve raid status reporting with lvs. Improve raid status reporting with lvs.

View File

@ -440,7 +440,7 @@ int lv_cache_wait_for_clean(struct logical_volume *cache_lv, int *is_clean)
if (cache_seg->cleaner_policy) { if (cache_seg->cleaner_policy) {
cache_seg->cleaner_policy = 0; cache_seg->cleaner_policy = 0;
/* Restore normal table */ /* Restore normal table */
if (!lv_update_and_reload(cache_lv)) if (!lv_update_and_reload_origin(cache_lv))
stack; stack;
} }
return 0; return 0;
@ -485,7 +485,7 @@ int lv_cache_wait_for_clean(struct logical_volume *cache_lv, int *is_clean)
/* Switch to cleaner policy to flush the cache */ /* Switch to cleaner policy to flush the cache */
cache_seg->cleaner_policy = 1; cache_seg->cleaner_policy = 1;
/* Reload cache volume with "cleaner" policy */ /* Reload cache volume with "cleaner" policy */
if (!lv_update_and_reload(cache_lv)) if (!lv_update_and_reload_origin(cache_lv))
return_0; return_0;
if (!sync_local_dev_names(cache_lv->vg->cmd)) { if (!sync_local_dev_names(cache_lv->vg->cmd)) {