projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[cascardo/linux.git]
/
drivers
/
md
/
dm-delay.c
diff --git
a/drivers/md/dm-delay.c
b/drivers/md/dm-delay.c
index
42c3a27
..
57b6a19
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);