aboutsummaryrefslogtreecommitdiff
path: root/block/scsi_ioctl.c
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2006-11-09 11:55:41 +0100
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-11-15 17:57:33 -0600
commit85e04e371b5a321b5df2bc3f8e0099a64fb087d7 (patch)
tree81a13557622a876f68953cd1db54520afc42ae15 /block/scsi_ioctl.c
parent667c667f86c87cd4f72296d650e5e65f2d89cb31 (diff)
downloadlinux-85e04e371b5a321b5df2bc3f8e0099a64fb087d7.tar.gz
[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: Hannes Reinecke <hare@suse.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'block/scsi_ioctl.c')
-rw-r--r--block/scsi_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 2dc326421a2..ac63964b724 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -304,7 +304,7 @@ static int sg_io(struct file *file, request_queue_t *q,
if (rq->bio)
blk_queue_bounce(q, &rq->bio);
- rq->timeout = (hdr->timeout * HZ) / 1000;
+ rq->timeout = jiffies_to_msecs(hdr->timeout);
if (!rq->timeout)
rq->timeout = q->sg_timeout;
if (!rq->timeout)