wipe: dev_set_bytes resolves zeroing

Since dev_write_zeros() is just subset of dev_set_bytes()
use it directly and simplify code.

diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index e3a1cbaff1df8bc55e4a1b4af76c350f8822914d..063ff3e031f367fc10c3bdd825ba9250b313c4d5 100644 (file)
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -7641,6 +7641,7 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp)
                        log_debug("Metadata logical volume %s will be fully zeroed.",
                                  display_lvname(lv));
                        zero_sectors = lv->size;
+                       wp.zero_value = 0;
                } else {
                        if (wp.is_metadata) /* Verbosely notify metadata will not be fully zeroed */
                                log_verbose("Metadata logical volume %s not fully zeroed and may contain stale data.",
@@ -7657,11 +7658,7 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp)
                            display_size(lv->vg->cmd, zero_sectors),
                            display_lvname(lv), wp.zero_value);
 
-               if ((!wp.is_metadata &&
-                    wp.zero_value && !dev_set_bytes(dev, UINT64_C(0),
-                                                    (size_t) zero_sectors << SECTOR_SHIFT,
-                                                    (uint8_t)wp.zero_value)) ||
-                   !dev_write_zeros(dev, UINT64_C(0), (size_t) zero_sectors << SECTOR_SHIFT)) {
+               if (!dev_set_bytes(dev, UINT64_C(0), (size_t) zero_sectors << SECTOR_SHIFT, wp.zero_value)) {
                        label_scan_invalidate(dev);
                        log_error("Failed to initialize %s of logical volume %s with value %d.",
                                  display_size(lv->vg->cmd, zero_sectors),