Commit 85e04e37 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by James Bottomley

[SCSI] block: convert jiffies to msecs in scsi_ioctl()

Use the proper conversion function for convert jiffies to msecs in
sg_io().
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 667c667f
...@@ -304,7 +304,7 @@ static int sg_io(struct file *file, request_queue_t *q, ...@@ -304,7 +304,7 @@ static int sg_io(struct file *file, request_queue_t *q,
if (rq->bio) if (rq->bio)
blk_queue_bounce(q, &rq->bio); blk_queue_bounce(q, &rq->bio);
rq->timeout = (hdr->timeout * HZ) / 1000; rq->timeout = jiffies_to_msecs(hdr->timeout);
if (!rq->timeout) if (!rq->timeout)
rq->timeout = q->sg_timeout; rq->timeout = q->sg_timeout;
if (!rq->timeout) if (!rq->timeout)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment