Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0d4d573 authored by Mike Christie's avatar Mike Christie Committed by Linus Torvalds
Browse files

[PATCH] Fix SG_IO timeout jiffy conversion 



Commit 85e04e37 cleaned up the timeout
conversion, but did it exactly the wrong way.  We get msecs from user
space, and should convert them into jiffies. Not the other way around.

Here is a fix with the overflow check sg.c has added in.  This fixes DVD
burnign with Nero.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
[ "you'll be wanting a comma there" - Andrew ]
Cc: Andrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 87df7241

block/scsi_ioctl.c

+3 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static int verify_command(struct file *file, unsigned char *cmd) 
static int sg_io(struct file *file, request_queue_t *q,

		struct gendisk *bd_disk, struct sg_io_hdr *hdr)

{

	unsigned long start_time;

	unsigned long start_time, timeout;

	int writing = 0, ret = 0;

	struct request *rq;

	char sense[SCSI_SENSE_BUFFERSIZE];
@@ -271,7 +271,8 @@ static int sg_io(struct file *file, request_queue_t *q, 


	rq->cmd_type = REQ_TYPE_BLOCK_PC;



	rq->timeout = jiffies_to_msecs(hdr->timeout);

	timeout = msecs_to_jiffies(hdr->timeout);

	rq->timeout = (timeout < INT_MAX) ? timeout : INT_MAX;

	if (!rq->timeout)

		rq->timeout = q->sg_timeout;

	if (!rq->timeout)