dm-stats: fix dm_jiffies_to_msec64

There were wrong calculations in dm_jiffies_to_msec64 that produced
incorrect output when HZ was different from 1000. This commit fixes them.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Assisted-by: Claude:claude-opus-4-6
Fixes: fd2ed4d25270 ("dm: add statistics support")
Cc: stable@vger.kernel.org

diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
index e06374a3329e68bc464ec72af7917c3182e10644..5df710061a11653f901c8c6bbf5fe6192928b6f9 100644 (file)
--- a/drivers/md/dm-stats.c
+++ b/drivers/md/dm-stats.c
@@ -840,10 +840,10 @@ static unsigned long long dm_jiffies_to_msec64(struct dm_stat *s, unsigned long
                result = jiffies_to_msecs(j & 0x3fffff);
        if (j >= 1 << 22) {
                mult = jiffies_to_msecs(1 << 22);
-               result += (unsigned long long)mult * (unsigned long long)jiffies_to_msecs((j >> 22) & 0x3fffff);
+               result += (unsigned long long)mult * ((j >> 22) & 0x3fffff);
        }
        if (j >= 1ULL << 44)
-               result += (unsigned long long)mult * (unsigned long long)mult * (unsigned long long)jiffies_to_msecs(j >> 44);
+               result += (unsigned long long)mult * (unsigned long long)(1 << 22) * (j >> 44);
 
        return result;
 }