From 2a92b87a13ee459d689d23f1cbc2e374a0a92c01 Mon Sep 17 00:00:00 2001 From: Ravi Kumar Siddojigari Date: Tue, 8 Dec 2020 22:27:31 +0530 Subject: [PATCH] Revert "dm verity: correcting logic used with corrupted_errs counter" This reverts commit b649934e088b7bd7d16f2a689af4e646b35d6bcd. Based on the upstream review comments its not advised to ignore the block error and continue so reverting this . Change-Id: Icf18bd5bdba96b396eee3ddff7e6d39a9bed5816 Signed-off-by: Ravi Kumar Siddojigari --- drivers/md/dm-verity-target.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c index 1202e71128d8..99cee512273f 100644 --- a/drivers/md/dm-verity-target.c +++ b/drivers/md/dm-verity-target.c @@ -220,10 +220,8 @@ static int verity_handle_err(struct dm_verity *v, enum verity_block_type type, /* Corruption should be visible in device status in all modes */ v->hash_failed = 1; - if (v->corrupted_errs >= DM_VERITY_MAX_CORRUPTED_ERRS) { - DMERR("%s: reached maximum errors", v->data_dev->name); + if (v->corrupted_errs >= DM_VERITY_MAX_CORRUPTED_ERRS) goto out; - } v->corrupted_errs++; @@ -241,16 +239,14 @@ static int verity_handle_err(struct dm_verity *v, enum verity_block_type type, DMERR_LIMIT("%s: %s block %llu is corrupted", v->data_dev->name, type_str, block); + if (v->corrupted_errs == DM_VERITY_MAX_CORRUPTED_ERRS) + DMERR("%s: reached maximum errors", v->data_dev->name); snprintf(verity_env, DM_VERITY_ENV_LENGTH, "%s=%d,%llu", DM_VERITY_ENV_VAR_NAME, type, block); kobject_uevent_env(&disk_to_dev(dm_disk(md))->kobj, KOBJ_CHANGE, envp); - /* corrupted_errs count had not reached limits */ - return 0; - - out: if (v->mode == DM_VERITY_MODE_LOGGING) return 0;