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

scanning: use bool type for _scan_text_mismatch

Browse Source
This commit is contained in:
David Teigland 2019-11-27 09:26:04 -06:00
parent b400353c71
commit 98a8099da9
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/metadata/metadata.c
View File

@ -4577,7 +4577,7 @@ void vg_write_commit_bad_mdas(struct cmd_context *cmd, struct volume_group *vg)
* reread metadata. * reread metadata.
*/ */
static int _scan_text_mismatch(struct cmd_context *cmd, const char *vgname, const char *vgid) static bool _scan_text_mismatch(struct cmd_context *cmd, const char *vgname, const char *vgid)
{ {
struct dm_list mda_list; struct dm_list mda_list;
struct mda_list *mdal, *safe; struct mda_list *mdal, *safe;
@ -4588,7 +4588,7 @@ static int _scan_text_mismatch(struct cmd_context *cmd, const char *vgname, cons
struct raw_locn *rlocn; struct raw_locn *rlocn;
struct device *dev; struct device *dev;
uint32_t bad_fields; uint32_t bad_fields;
int ret = 1; bool ret = true;
/* /*
* if cmd->can_use_one_scan, check one mda_header is unchanged, * if cmd->can_use_one_scan, check one mda_header is unchanged,
@ -4610,7 +4610,6 @@ static int _scan_text_mismatch(struct cmd_context *cmd, const char *vgname, cons
if (!(dev = mda_get_device(mda))) { if (!(dev = mda_get_device(mda))) {
log_debug("rescan for text mismatch - no mda dev"); log_debug("rescan for text mismatch - no mda dev");
ret = 1;
goto out; goto out;
} }
@ -4624,13 +4623,11 @@ static int _scan_text_mismatch(struct cmd_context *cmd, const char *vgname, cons
*/ */
if (!dev_invalidate_bytes(dev, 4096, 512)) { if (!dev_invalidate_bytes(dev, 4096, 512)) {
log_debug("rescan for text mismatch - cannot invalidate"); log_debug("rescan for text mismatch - cannot invalidate");
ret = 1;
goto out; goto out;
} }
if (!(mdah = raw_read_mda_header(cmd->fmt, area, 1, 0, &bad_fields))) { if (!(mdah = raw_read_mda_header(cmd->fmt, area, 1, 0, &bad_fields))) {
log_debug("rescan for text mismatch - no mda header"); log_debug("rescan for text mismatch - no mda header");
ret = 1;
goto out; goto out;
} }
@ -4638,18 +4635,16 @@ static int _scan_text_mismatch(struct cmd_context *cmd, const char *vgname, cons
if (bad_fields) { if (bad_fields) {
log_debug("rescan for text mismatch - bad_fields"); log_debug("rescan for text mismatch - bad_fields");
ret = 1;
} else if (rlocn->checksum != mda->scan_text_checksum) { } else if (rlocn->checksum != mda->scan_text_checksum) {
log_debug("rescan for text checksum mismatch - now %x prev %x", log_debug("rescan for text checksum mismatch - now %x prev %x",
rlocn->checksum, mda->scan_text_checksum); rlocn->checksum, mda->scan_text_checksum);
ret = 1;
} else if (rlocn->offset != mda->scan_text_offset) { } else if (rlocn->offset != mda->scan_text_offset) {
log_debug("rescan for text offset mismatch - now %llu prev %llu", log_debug("rescan for text offset mismatch - now %llu prev %llu",
(unsigned long long)rlocn->offset, (unsigned long long)rlocn->offset,
(unsigned long long)mda->scan_text_offset); (unsigned long long)mda->scan_text_offset);
ret = 1;
} else { } else {
ret = 0; /* the common case where fields match and no rescan needed */
ret = false;
} }
dm_pool_free(cmd->mem, mdah); dm_pool_free(cmd->mem, mdah);
@ -4668,12 +4663,11 @@ static int _scan_text_mismatch(struct cmd_context *cmd, const char *vgname, cons
log_debug("rescan for text mismatch - no mdas"); log_debug("rescan for text mismatch - no mdas");
goto out; goto out;
} }
ret = 0;
out: out:
if (!ret) if (!ret)
log_debug("rescan skipped - text offset and checksum unchanged"); log_debug("rescan skipped - unchanged offset %llu checksum %x",
(unsigned long long)mda->scan_text_offset,
mda->scan_text_checksum);
dm_list_iterate_items_safe(mdal, safe, &mda_list) { dm_list_iterate_items_safe(mdal, safe, &mda_list) {
dm_list_del(&mdal->list); dm_list_del(&mdal->list);