Skip to content

Commit

Permalink
[SCSI] block: convert jiffies to msecs in scsi_ioctl()
Browse files Browse the repository at this point in the history
Use the proper conversion function for convert jiffies to msecs in
sg_io().

Signed-off-by: Hannes Reinecke <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
  • Loading branch information
hreinecke authored and James Bottomley committed Nov 15, 2006
1 parent 667c667 commit 85e04e3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion block/scsi_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 85e04e3

Please sign in to comment.