debug: show message only when origin_only was set

diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index c431868d339f9e2c9b0a66972bfbba500a989584..1a584f2240e033bb43ec5d5ca0ff98e173b7a612 100644 (file)
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -6372,7 +6372,7 @@ static int _lv_update_and_reload(struct logical_volume *lv, int origin_only)
        if (!vg_write(vg))
                return_0;
 
-       if (lock_lv != lv) {
+       if (origin_only && (lock_lv != lv)) {
                log_debug_activation("Dropping origin_only for %s as lock holds %s",
                                     display_lvname(lv), display_lvname(lock_lv));
                origin_only = 0;

diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 66fc2bd472274b59822e9d4557eeebf60923fbd0..08347f96d2cd7ca7530e757a5485c268eb176bc6 100644 (file)
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -557,7 +557,7 @@ static int _lv_update_reload_fns_reset_eliminate_lvs(struct logical_volume *lv,
        va_start(ap, origin_only);
        removal_lvs = va_arg(ap, struct dm_list *);
 
-       if (lock_lv != lv) {
+       if (origin_only && (lock_lv != lv)) {
                log_debug_activation("Dropping origin_only for %s as lock holds %s",
                                     display_lvname(lv), display_lvname(lock_lv));
                origin_only = 0;
@@ -649,7 +649,7 @@ static int _lv_update_and_reload_list(struct logical_volume *lv, int origin_only
        struct lv_list *lvl;
        int r;
 
-       if (lock_lv != lv) {
+       if (origin_only && (lock_lv != lv)) {
                log_debug_activation("Dropping origin_only for %s as lock holds %s",
                                     display_lvname(lv), display_lvname(lock_lv));
                origin_only = 0;
@@ -2120,7 +2120,7 @@ static int _vg_write_lv_suspend_commit_backup(struct volume_group *vg,
        const struct logical_volume *lock_lv = lv_lock_holder(lv);
        int r = 1;
 
-       if (lock_lv != lv) {
+       if (origin_only && (lock_lv != lv)) {
                log_debug_activation("Dropping origin_only for %s as lock holds %s",
                                     display_lvname(lv), display_lvname(lock_lv));
                origin_only = 0;