Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / drivers / md / dm-delay.c

diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c
index 42c3a27a14cc3a906b5f892a6206de348b6b58ee..57b6a1901c917127eccb8247cd1015a9b588159e 100644 (file)
--- a/drivers/md/dm-delay.c
+++ b/drivers/md/dm-delay.c
@@ -236,7 +236,7 @@ static int delay_bio(struct delay_c *dc, int delay, struct bio *bio)
        delayed = dm_per_bio_data(bio, sizeof(struct dm_delay_info));
 
        delayed->context = dc;
-       delayed->expires = expires = jiffies + (delay * HZ / 1000);
+       delayed->expires = expires = jiffies + msecs_to_jiffies(delay);
 
        mutex_lock(&delayed_bios_lock);