diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 16:58:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 16:58:18 +0100 |
| commit | b7ed1de0ae4edb3fd2c53fa3dd7e6f104beb6d00 (patch) | |
| tree | 998cc8b411555c7225260b7f7cf8e03cb648f37f /block | |
| parent | [PATCH] alpha: set cpu_possible_map much earlier (diff) | |
| parent | [PATCH] blk: Fix SG_IO ioctl failure retry looping (diff) | |
| download | linux-b7ed1de0ae4edb3fd2c53fa3dd7e6f104beb6d00.tar.xz linux-b7ed1de0ae4edb3fd2c53fa3dd7e6f104beb6d00.zip | |
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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index cc72210687eb..24f7af9d0abc 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 */ |