commit 85e04e371b5a321b5df2bc3f8e0099a64fb087d7
author Hannes Reinecke <hare@suse.de> Thu Nov 09 11:55:41 2006 +0100
committer James Bottomley <jejb@mulgrave.il.steeleye.com> Wed Nov 15 17:57:33 2006 -0600
tree 81a13557622a876f68953cd1db54520afc42ae15
parent 667c667f86c87cd4f72296d650e5e65f2d89cb31

[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>

block/scsi_ioctl.c

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 2dc3264..ac63964 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -304,7 +304,7 @@
 	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)