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

Commit b7ed1de0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

parents 328c2a8a 01840f9c

block/scsi_ioctl.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -310,6 +310,8 @@ static int sg_io(struct file *file, request_queue_t *q, 
	if (!rq->timeout)

	if (!rq->timeout)

		rq->timeout = BLK_DEFAULT_TIMEOUT;

		rq->timeout = BLK_DEFAULT_TIMEOUT;





	rq->retries = 0;



	start_time = jiffies;

	start_time = jiffies;





	/* ignore return value. All information is passed back to caller

	/* ignore return value. All information is passed back to caller
@@ -427,6 +429,7 @@ static int sg_scsi_ioctl(struct file *file, request_queue_t *q, 
	rq->data = buffer;

	rq->data = buffer;

	rq->data_len = bytes;

	rq->data_len = bytes;

	rq->flags |= REQ_BLOCK_PC;

	rq->flags |= REQ_BLOCK_PC;

	rq->retries = 0;





	blk_execute_rq(q, bd_disk, rq, 0);

	blk_execute_rq(q, bd_disk, rq, 0);

	err = rq->errors & 0xff;	/* only 8 bit SCSI status */

	err = rq->errors & 0xff;	/* only 8 bit SCSI status */