From: Hannes Reinecke <hare@suse.de>
Date: Thu, 9 Nov 2006 10:55:41 +0000 (+0100)
Subject: [SCSI] block: convert jiffies to msecs in scsi_ioctl()
X-Git-Tag: v2.6.20-rc1~34^2~20^2~41^2~56
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85e04e371b5a321b5df2bc3f8e0099a64fb087d7;p=pandora-kernel.git

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

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 2dc326421a24..ac63964b7242 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)