From 876bda17bfa0ab1205dace078c4e6dc6d052abf9 Mon Sep 17 00:00:00 2001 From: Coly Li Date: Apr 13 2024 08:07:07 +0000 Subject: dm integrity: fix out-of-range warning (git-fixes). --- diff --git a/patches.suse/dm-integrity-fix-out-of-range-warning-8e91.patch b/patches.suse/dm-integrity-fix-out-of-range-warning-8e91.patch new file mode 100644 index 0000000..c19a65e --- /dev/null +++ b/patches.suse/dm-integrity-fix-out-of-range-warning-8e91.patch @@ -0,0 +1,47 @@ +From 8e91c2342351e0f5ef6c0a704384a7f6fc70c3b2 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Thu, 28 Mar 2024 15:30:39 +0100 +Subject: [PATCH] dm integrity: fix out-of-range warning +Git-commit: 8e91c2342351e0f5ef6c0a704384a7f6fc70c3b2 +Patch-mainline: v6.9-rc2 +References: git-fixes + +Depending on the value of CONFIG_HZ, clang complains about a pointless +Comparison: + +drivers/md/dm-integrity.c:4085:12: error: result of comparison of + constant 42949672950 with expression of type + 'unsigned int' is always false + [-Werror,-Wtautological-constant-out-of-range-compare] + if (val >= (uint64_t)UINT_MAX * 1000 / HZ) { + +As the check remains useful for other configurations, shut up the +warning by adding a second type cast to uint64_t. + +Fixes: 468dfca38b1a ("dm integrity: add a bitmap mode") +Signed-off-by: Arnd Bergmann +Reviewed-by: Mikulas Patocka +Reviewed-by: Justin Stitt +Signed-off-by: Mike Snitzer +Signed-off-by: Coly Li + +--- + drivers/md/dm-integrity.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c +index 37b9f8f1ae1a..7f3dc8ee6ab8 100644 +--- a/drivers/md/dm-integrity.c ++++ b/drivers/md/dm-integrity.c +@@ -4221,7 +4221,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned int argc, char **argv + } else if (sscanf(opt_string, "sectors_per_bit:%llu%c", &llval, &dummy) == 1) { + log2_sectors_per_bitmap_bit = !llval ? 0 : __ilog2_u64(llval); + } else if (sscanf(opt_string, "bitmap_flush_interval:%u%c", &val, &dummy) == 1) { +- if (val >= (uint64_t)UINT_MAX * 1000 / HZ) { ++ if ((uint64_t)val >= (uint64_t)UINT_MAX * 1000 / HZ) { + r = -EINVAL; + ti->error = "Invalid bitmap_flush_interval argument"; + goto bad; +-- +2.35.3 + diff --git a/series.conf b/series.conf index fb250ce..49dd039 100644 --- a/series.conf +++ b/series.conf @@ -46074,6 +46074,7 @@ patches.suse/ALSA-aoa-avoid-false-positive-format-truncation-warn.patch patches.suse/mmc-core-Initialize-mmc_blk_ioc_data.patch patches.suse/mmc-core-Avoid-negative-index-with-array-access.patch + patches.suse/dm-integrity-fix-out-of-range-warning-8e91.patch patches.suse/ACPICA-debugger-check-status-of-acpi_evaluate_object.patch patches.suse/x86-bugs-Fix-the-SRSO-mitigation-on-Zen3-4.patch patches.suse/drm-amdkfd-fix-TLB-flush-after-unmap-for-GFX9.4.2.patch