shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-11-17 08:23:48 +03:00
Code Releases Activity

debug: log_warn sentence begins with capital

Browse Source 
Improve the consistency and readability of warning messages.
Capitalize the first word of all warning messages.
Add periods at the end of warning messages.

The changes are purely cosmetic and do not affect functionality.
This commit is contained in:
Zdenek Kabelac
2025-07-11 19:41:15 +02:00
parent 296fcd4c79
commit bdfdc52093
30 changed files with 148 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/format_text/format-text.c
View File

@@ -193,11 +193,11 @@ static void _xlate_mdah(struct mda_header *mdah)
static int _raw_read_mda_header(struct mda_header *mdah, struct device_area *dev_area,
int primary_mda, uint32_t ignore_bad_fields, uint32_t *bad_fields)
{
log_debug_metadata("Reading mda header sector from %s at %llu",
log_debug_metadata("Reading mda header sector from %s at %llu.",
dev_name(dev_area->dev), (unsigned long long)dev_area->start);
if (!dev_read_bytes(dev_area->dev, dev_area->start, MDA_HEADER_SIZE, mdah)) {
log_error("Failed to read metadata area header on %s at %llu",
log_error("Failed to read metadata area header on %s at %llu.",
dev_name(dev_area->dev), (unsigned long long)dev_area->start);
*bad_fields |= BAD_MDA_READ;
return 0;
@@ -206,7 +206,7 @@ static int _raw_read_mda_header(struct mda_header *mdah, struct device_area *dev
if (mdah->checksum_xl != htole32(calc_crc(INITIAL_CRC, (uint8_t *)mdah->magic,
MDA_HEADER_SIZE -
sizeof(mdah->checksum_xl)))) {
log_warn("WARNING: wrong checksum %x in mda header on %s at %llu",
log_warn("WARNING: Wrong checksum %x in mda header on %s at %llu.",
mdah->checksum_xl,
dev_name(dev_area->dev), (unsigned long long)dev_area->start);
*bad_fields |= BAD_MDA_CHECKSUM;
@@ -215,20 +215,20 @@ static int _raw_read_mda_header(struct mda_header *mdah, struct device_area *dev
_xlate_mdah(mdah);
if (memcmp(mdah->magic, FMTT_MAGIC, sizeof(mdah->magic))) {
log_warn("WARNING: wrong magic number in mda header on %s at %llu",
log_warn("WARNING: Wrong magic number in mda header on %s at %llu.",
dev_name(dev_area->dev), (unsigned long long)dev_area->start);
*bad_fields |= BAD_MDA_MAGIC;
}
if (mdah->version != FMTT_VERSION) {
log_warn("WARNING: wrong version %u in mda header on %s at %llu",
log_warn("WARNING: Wrong version %u in mda header on %s at %llu.",
mdah->version,
dev_name(dev_area->dev), (unsigned long long)dev_area->start);
*bad_fields |= BAD_MDA_VERSION;
}
if (mdah->start != dev_area->start) {
log_warn("WARNING: wrong start sector %llu in mda header on %s at %llu",
log_warn("WARNING: Wrong start sector %llu in mda header on %s at %llu.",
(unsigned long long)mdah->start,
dev_name(dev_area->dev), (unsigned long long)dev_area->start);
*bad_fields |= BAD_MDA_START;
@@ -337,7 +337,7 @@ static uint64_t _next_rlocn_offset(struct volume_group *vg, struct raw_locn *rlo
/* This has only been designed to work with 512. */
if (alignment != 512)
log_warn("WARNING: metadata alignment should be 512 not %llu",
log_warn("WARNING: Metadata alignment should be 512 not %llu.",
(unsigned long long)alignment);
/*
@@ -475,13 +475,13 @@ static struct volume_group *_vg_read_raw(struct cmd_context *cmd,
*/
struct device *dev = mdac->area.dev;
struct lvmcache_info *info = lvmcache_info_from_pvid(dev->pvid, dev, 0);
log_warn("WARNING: reading %s mda%d failed to read metadata.", dev_name(dev), mda_is_primary(mda)?1:2);
log_warn("WARNING: repair VG metadata on %s with vgck --updatemetadata.", dev_name(dev));
log_warn("WARNING: Reading %s mda%d failed to read metadata.", dev_name(dev), mda_is_primary(mda)?1:2);
log_warn("WARNING: Repair VG metadata on %s with vgck --updatemetadata.", dev_name(dev));
if (info)
/* remove mda from lvmcache, saving it in info->bad_mdas for possible repair with updatemetadata */
lvmcache_del_save_bad_mda(info, mda->mda_num, BAD_MDA_TEXT);
else
log_warn("WARNING: No cache info for %s", dev_name(dev));
log_warn("WARNING: No cache info for %s.", dev_name(dev));
/* remove mda from fid */
fid_remove_mda(fid, mda, NULL, 0, 0);
@@ -1558,7 +1558,7 @@ int read_metadata_location_summary(const struct format_type *fmt,
(off_t) (dev_area->start + MDA_HEADER_SIZE),
wrap, calc_crc, vgsummary->vgname ? 1 : 0,
vgsummary)) {
log_warn("WARNING: metadata on %s at %llu has invalid summary for VG.",
log_warn("WARNING: Metadata on %s at %llu has invalid summary for VG.",
dev_name(dev_area->dev),
(unsigned long long)(dev_area->start + rlocn->offset));
return 0;
@@ -1566,7 +1566,7 @@ int read_metadata_location_summary(const struct format_type *fmt,
/* Ignore this entry if the characters aren't permissible */
if (!validate_name(vgsummary->vgname)) {
log_warn("WARNING: metadata on %s at %llu has invalid VG name.",
log_warn("WARNING: Metadata on %s at %llu has invalid VG name.",
dev_name(dev_area->dev),
(unsigned long long)(dev_area->start + rlocn->offset));
return 0;

8
lib/format_text/import.c
View File

@@ -62,13 +62,13 @@ int text_read_metadata_summary(const struct format_type *fmt,
offset2, size2, checksum_fn,
vgsummary->mda_checksum,
checksum_only, 1, 1)) {
log_warn("WARNING: invalid metadata text from %s at %llu.",
log_warn("WARNING: Invalid metadata text from %s at %llu.",
dev_name(dev), (unsigned long long)offset);
goto out;
}
} else {
if (!config_file_read_from_file(cft)) {
log_warn("WARNING: invalid metadata text from file.");
log_warn("WARNING: Invalid metadata text from file.");
goto out;
}
}
@@ -157,12 +157,12 @@ struct volume_group *text_read_metadata(struct format_instance *fid,
if (!config_file_read_fd(cft, dev, MDA_CONTENT_REASON(primary_mda), offset, size,
offset2, size2, checksum_fn, checksum,
skip_parse, 1, 0)) {
log_warn("WARNING: couldn't read volume group metadata from %s.", dev_name(dev));
log_warn("WARNING: Couldn't read volume group metadata from %s.", dev_name(dev));
goto out;
}
} else {
if (!config_file_read_from_file(cft)) {
log_warn("WARNING: couldn't read volume group metadata from file.");
log_warn("WARNING: Couldn't read volume group metadata from file.");
goto out;
}
}

12
lib/format_text/text_label.c
View File

@@ -332,7 +332,7 @@ static int _read_mda_header_and_metadata(const struct format_type *fmt,
retry:
if (!(mdah = raw_read_mda_header(fmt, &mdac->area, (mda->mda_num == 1), 0, bad_fields))) {
log_warn("WARNING: bad metadata header on %s at %llu.",
log_warn("WARNING: Bad metadata header on %s at %llu.",
dev_name(mdac->area.dev),
(unsigned long long)mdac->area.start);
mda->header_start = mdac->area.start;
@@ -389,7 +389,7 @@ static int _read_mda_header_and_metadata(const struct format_type *fmt,
goto retry;
}
log_warn("WARNING: bad metadata text on %s in mda%d",
log_warn("WARNING: Bad metadata text on %s in mda%d.",
dev_name(mdac->area.dev), mda->mda_num);
*bad_fields |= BAD_MDA_TEXT;
return 0;
@@ -574,8 +574,8 @@ static int _text_read(struct cmd_context *cmd, struct labeller *labeller, struct
* used by vg_read/vg_write, but keep track of it in
* lvmcache for repair.
*/
log_warn("WARNING: scanning %s mda1 failed to read metadata summary.", dev_name(dev));
log_warn("WARNING: repair VG metadata on %s with vgck --updatemetadata.", dev_name(dev));
log_warn("WARNING: Scanning %s mda1 failed to read metadata summary.", dev_name(dev));
log_warn("WARNING: Repair VG metadata on %s with vgck --updatemetadata.", dev_name(dev));
dm_list_del(&mda1->list);
mda1->bad_fields = bad_fields;
@@ -624,8 +624,8 @@ static int _text_read(struct cmd_context *cmd, struct labeller *labeller, struct
* used by vg_read/vg_write, but keep track of it in
* lvmcache for repair.
*/
log_warn("WARNING: scanning %s mda2 failed to read metadata summary.", dev_name(dev));
log_warn("WARNING: repair VG metadata on %s with vgck --updatemetadata.", dev_name(dev));
log_warn("WARNING: Scanning %s mda2 failed to read metadata summary.", dev_name(dev));
log_warn("WARNING: Repair VG metadata on %s with vgck --updatemetadata.", dev_name(dev));
dm_list_del(&mda2->list);
mda2->bad_fields = bad_fields;