Patch "dm-delay: fix max_delay calculations" has been added to the 6.8-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    dm-delay: fix max_delay calculations

to the 6.8-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     dm-delay-fix-max_delay-calculations.patch
and it can be found in the queue-6.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 2b03ce8b7380cd7ed966f353783644e56f708357
Author: Benjamin Marzinski <bmarzins@xxxxxxxxxx>
Date:   Mon May 6 17:55:44 2024 -0400

    dm-delay: fix max_delay calculations
    
    [ Upstream commit 64eb88d6caee2c8eb806a68dab3f184f14f818a4 ]
    
    delay_ctr() pointlessly compared max_delay in cases where multiple delay
    classes were initialized identically. Also, when write delays were
    configured different than read delays, delay_ctr() never compared their
    value against max_delay. Fix these issues.
    
    Fixes: 70bbeb29fab0 ("dm delay: for short delays, use kthread instead of timers and wq")
    Signed-off-by: Benjamin Marzinski <bmarzins@xxxxxxxxxx>
    Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c
index 4ba12d5369949..2ac43d1f1b92c 100644
--- a/drivers/md/dm-delay.c
+++ b/drivers/md/dm-delay.c
@@ -242,19 +242,18 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 		ret = delay_class_ctr(ti, &dc->flush, argv);
 		if (ret)
 			goto bad;
-		max_delay = max(max_delay, dc->write.delay);
-		max_delay = max(max_delay, dc->flush.delay);
 		goto out;
 	}
 
 	ret = delay_class_ctr(ti, &dc->write, argv + 3);
 	if (ret)
 		goto bad;
+	max_delay = max(max_delay, dc->write.delay);
+
 	if (argc == 6) {
 		ret = delay_class_ctr(ti, &dc->flush, argv + 3);
 		if (ret)
 			goto bad;
-		max_delay = max(max_delay, dc->flush.delay);
 		goto out;
 	}