Commit 64eb88d6 authored May 06, 2024 by Benjamin Marzinski Committed by Mike Snitzer May 09, 2024

dm-delay: fix max_delay calculations

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: 70bbeb29 ("dm delay: for short delays, use kthread instead of timers and wq")
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>

parent d14646f2

drivers/md/dm-delay.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}