aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-08 07:58:18 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-08 07:58:18 -0800
commitb7ed1de0ae4edb3fd2c53fa3dd7e6f104beb6d00 (patch)
tree998cc8b411555c7225260b7f7cf8e03cb648f37f /block
parent328c2a8a39e1ba43a6e54e43fc752f7035779561 (diff)
parent01840f9c9d7ae366311302077ace6bc39169399b (diff)
downloadlinux-2.6.34-ux500-b7ed1de0ae4edb3fd2c53fa3dd7e6f104beb6d00.tar.gz
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'block')
-rw-r--r--block/scsi_ioctl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index cc72210687e..24f7af9d0ab 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -310,6 +310,8 @@ static int sg_io(struct file *file, request_queue_t *q,
if (!rq->timeout)
rq->timeout = BLK_DEFAULT_TIMEOUT;
+ rq->retries = 0;
+
start_time = jiffies;
/* 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_len = bytes;
rq->flags |= REQ_BLOCK_PC;
+ rq->retries = 0;
blk_execute_rq(q, bd_disk, rq, 0);
err = rq->errors & 0xff; /* only 8 bit SCSI status */