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

thin: fix checking monitor mode

Browse Source 
Previous commit 874a8ab4d02a59c5 missed 'IGNORE' mode.
Fix it by adding rather 'explicit' test for this value,
so the code is better readable.

Also unlock memory earlier and drop unneeded <backtrace>
from return since we already logged error in this function.
This commit is contained in:
Zdenek Kabelac 2025-02-25 00:28:33 +01:00
parent 5430eec2b9
commit 7d0acdbcb0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/metadata/thin_manip.c
View File

@ -624,8 +624,8 @@ int update_thin_pool_lv(struct logical_volume *lv, int activate)
if (activate) {
/* If the pool is not active, do activate deactivate */
monitored = (dmeventd_monitor_mode() == 1) ? 1 : 0;
init_dmeventd_monitor(DMEVENTD_MONITOR_IGNORE);
if (DMEVENTD_MONITOR_IGNORE != (monitored = dmeventd_monitor_mode()))
init_dmeventd_monitor(DMEVENTD_MONITOR_IGNORE);
if (!lv_is_active(lv)) {
/*
* FIXME:
@ -660,6 +660,9 @@ int update_thin_pool_lv(struct logical_volume *lv, int activate)
}
}
/* Unlock memory if possible */
memlock_unlock(lv->vg->cmd);
if (!sync_local_dev_names(lv->vg->cmd)) {
log_error("Failed to sync local devices LV %s.",
display_lvname(lv));
@ -673,11 +676,8 @@ int update_thin_pool_lv(struct logical_volume *lv, int activate)
}
init_dmeventd_monitor(monitored);
/* Unlock memory if possible */
memlock_unlock(lv->vg->cmd);
if (!ret)
return_0;
return 0;
}
dm_list_init(&(first_seg(lv)->thin_messages));