Commit 85e04e37 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by James Bottomley
Browse files

[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: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 667c667f

block/scsi_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -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)