[SCSI] block: convert jiffies to msecs in scsi_ioctl()
authorHannes Reinecke <hare@suse.de>
Thu, 9 Nov 2006 10:55:41 +0000 (11:55 +0100)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Wed, 15 Nov 2006 23:57:33 +0000 (17:57 -0600)
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

index 2dc326421a24af9c745e9f4eb34f7a80f1a41d0a..ac63964b72421d591f933dafcdc51220f67f3c43 100644 (file)
@@ -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)