shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-23 02:05:07 +03:00
Code Releases Activity

debug: shorten error message

Browse Source 
Just check for sigint during log_error().
This commit is contained in:
Zdenek Kabelac 2020-10-19 14:28:58 +02:00
parent b9d2aa9488
commit f0913c6482
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/metadata/lv_manip.c
View File

@ -7240,12 +7240,9 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp)
wp.yes, wp.force, NULL)) { wp.yes, wp.force, NULL)) {
sigint_restore(); sigint_restore();
label_scan_invalidate(dev); label_scan_invalidate(dev);
if (sigint_caught()) { log_error("%s logical volume %s.",
log_error("Interrupted initialization logical volume %s.", sigint_caught() ?
display_lvname(lv)); "Interrupted initialization of" : "Failed to wipe signatures on",
return 0;
}
log_error("Filed to wipe signatures of logical volume %s.",
display_lvname(lv)); display_lvname(lv));
return 0; return 0;
} }
@ -7290,12 +7287,9 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp)
log_sys_debug("ioctl", "BLKZEROOUT"); log_sys_debug("ioctl", "BLKZEROOUT");
sigint_restore(); sigint_restore();
label_scan_invalidate(dev); label_scan_invalidate(dev);
if (sigint_caught()) log_error("%s logical volume %s at position " FMTu64 " and size " FMTu64 ".",
log_error("Interrupted initialization logical volume %s.", sigint_caught() ? "Interrupted initialization of" : "Failed to initialize",
display_lvname(lv)); display_lvname(lv), range[0], range[1]);
else
log_error("Failed to initialize logical volume %s at position " FMTu64 " and size " FMTu64 ".",
display_lvname(lv), range[0], range[1]);
return 0; return 0;
} }
} }
@ -7304,12 +7298,8 @@ retry_with_dev_set:
#endif #endif
if (!dev_set_bytes(dev, UINT64_C(0), (size_t) zero_sectors << SECTOR_SHIFT, wp.zero_value)) { if (!dev_set_bytes(dev, UINT64_C(0), (size_t) zero_sectors << SECTOR_SHIFT, wp.zero_value)) {
sigint_restore(); sigint_restore();
if (sigint_caught()) { log_error("%s %s of logical volume %s with value %d.",
log_error("Interrupted initialization logical volume %s.", sigint_caught() ? "Interrupted initialization" : "Failed to initialize",
display_lvname(lv));
return 0;
}
log_error("Failed to initialize %s of logical volume %s with value %d.",
display_size(lv->vg->cmd, zero_sectors), display_size(lv->vg->cmd, zero_sectors),
display_lvname(lv), wp.zero_value); display_lvname(lv), wp.zero_value);
return 0; return 0;