4 files changed, 20 insertions, 21 deletions

diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 59e14291..d591b7b5 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -2152,8 +2152,8 @@ int lv_add_virtual_segment(struct logical_volume *lv, uint64_t status,
 			size = ((uint64_t)lv->vg->extent_size * extents + size - 1) /
 				size * size / lv->vg->extent_size;
 			if (size != extents) {
-				log_print("Rounding size (%d extents) up to chunk boundary "
-					  "size (%d extents).", extents, size);
+				log_print_unless_silent("Rounding size (%d extents) up to chunk boundary "
+							"size (%d extents).", extents, size);
 				extents = size;
 			}
 		}
@@ -2738,7 +2738,7 @@ int lv_extend(struct logical_volume *lv,
 			percent_t sync_percent = PERCENT_INVALID;
 
 			if (!lv_is_active(lv)) {
-				log_print("%s/%s is not active."
+				log_error("%s/%s is not active."
 					  "  Unable to get sync percent.",
 					  lv->vg->name, lv->name);
 				if (yes_no_prompt("Do full resync of extended "
@@ -3378,7 +3378,7 @@ int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv,
 	backup(vg);
 
 	if (visible)
-		log_print("Logical volume \"%s\" successfully removed", lv->name);
+		log_print_unless_silent("Logical volume \"%s\" successfully removed", lv->name);
 
 	return 1;
 }
@@ -4207,8 +4207,8 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, struct l
 	}
 
 	if ((size_rest = lp->extents % lp->stripes)) {
-		log_print("Rounding size (%d extents) up to stripe boundary "
-			  "size (%d extents)", lp->extents,
+		log_print_unless_silent("Rounding size (%d extents) up to stripe boundary "
+					"size (%d extents)", lp->extents,
 			  lp->extents - size_rest + lp->stripes);
 		lp->extents = lp->extents - size_rest + lp->stripes;
 	}
@@ -4650,7 +4650,7 @@ int lv_create_single(struct volume_group *vg,
 		return_0;
 
 out:
-	log_print("Logical volume \"%s\" created", lv->name);
+	log_print_unless_silent("Logical volume \"%s\" created", lv->name);
 
 	return 1;
 }
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 205f77ea..220e0c15 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -623,7 +623,7 @@ int vg_remove(struct volume_group *vg)
 		stack;
 
 	if (ret)
-		log_print("Volume group \"%s\" successfully removed", vg->name);
+		log_print_unless_silent("Volume group \"%s\" successfully removed", vg->name);
 	else
 		log_error("Volume group \"%s\" not properly removed", vg->name);
 
@@ -988,8 +988,8 @@ uint64_t extents_from_size(struct cmd_context *cmd, uint64_t size,
 {
 	if (size % extent_size) {
 		size += extent_size - size % extent_size;
-		log_print("Rounding up size to full physical extent %s",
-			  display_size(cmd, size));
+		log_print_unless_silent("Rounding up size to full physical extent %s",
+			  		display_size(cmd, size));
 	}
 
 	if (size > (uint64_t) MAX_EXTENT_COUNT * extent_size) {
@@ -1305,7 +1305,7 @@ static int _wipe_sb(struct device *dev, const char *type, const char *name,
 		return 0;
 	}
 
-	log_print("Wiping %s on %s.", type, name);
+	log_print_unless_silent("Wiping %s on %s.", type, name);
 	if (!dev_set(dev, superblock, wipe_len, 0)) {
 		log_error("Failed to wipe %s on %s.", type, name);
 		return 0;
@@ -1477,7 +1477,7 @@ static int _pvcreate_write(struct cmd_context *cmd, struct pv_to_create *pvc)
 		return 0;
 	}
 
-	log_print("Physical volume \"%s\" successfully created", pv_name);
+	log_print_unless_silent("Physical volume \"%s\" successfully created", pv_name);
 	return 1;
 }
 
diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c
index e3662c12..c4683dff 100644
--- a/lib/metadata/mirror.c
+++ b/lib/metadata/mirror.c
@@ -168,8 +168,8 @@ uint32_t adjusted_mirror_region_size(uint32_t extent_size, uint32_t extents,
 
 	if (region_max < UINT32_MAX && region_size > region_max) {
 		region_size = (uint32_t) region_max;
-		log_print("Using reduced mirror region size of %" PRIu32
-			  " sectors", region_size);
+		log_print_unless_silent("Using reduced mirror region size of %" PRIu32
+					" sectors", region_size);
 	}
 
 	return region_size;
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 0d4640f5..11888911 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -1311,8 +1311,8 @@ int lv_raid_split_and_track(struct logical_volume *lv,
 		return 0;
 	}
 
-	log_print("%s split from %s for read-only purposes.",
-		  seg_lv(seg, s)->name, lv->name);
+	log_print_unless_silent("%s split from %s for read-only purposes.",
+				seg_lv(seg, s)->name, lv->name);
 
 	/* Resume original LV */
 	if (!resume_lv(lv->vg->cmd, lv)) {
@@ -1325,8 +1325,8 @@ int lv_raid_split_and_track(struct logical_volume *lv,
 	if (!_activate_sublv_preserving_excl(lv, seg_lv(seg, s)))
 		return 0;
 
-	log_print("Use 'lvconvert --merge %s/%s' to merge back into %s",
-		  lv->vg->name, seg_lv(seg, s)->name, lv->name);
+	log_print_unless_silent("Use 'lvconvert --merge %s/%s' to merge back into %s",
+				lv->vg->name, seg_lv(seg, s)->name, lv->name);
 	return 1;
 }
 
@@ -1410,9 +1410,8 @@ int lv_raid_merge(struct logical_volume *image_lv)
 		return 0;
 	}
 
-	log_print("%s/%s successfully merged back into %s/%s",
-		  vg->name, image_lv->name,
-		  vg->name, lv->name);
+	log_print_unless_silent("%s/%s successfully merged back into %s/%s",
+				vg->name, image_lv->name, vg->name, lv->name);
 	return 1;
 }