path: root/block/scsi_ioctl.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-05 14:49:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-05 14:49:18 -0800
commitf2f1fa78a155524b849edf359e42a3001ea652c0 (patch)
tree8d38fc76e48fc219e393ee57ee5f76843b735258 /block/scsi_ioctl.c
parent24920a79a27dd28e67088bbfcf36746d15587f4d (diff)
Enforce a minimum SG_IO timeout
There's no point in having too short SG_IO timeouts, since if the command does end up timing out, we'll end up through the reset sequence that is several seconds long in order to abort the command that timed out. As a result, shorter timeouts than a few seconds simply do not make sense, as the recovery would be longer than the timeout itself. Add a BLK_MIN_SG_TIMEOUT to match the existign BLK_DEFAULT_SG_TIMEOUT. Suggested-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Acked-by: Tejun Heo <tj@kernel.org> Acked-by: Jens Axboe <jens.axboe@oracle.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'block/scsi_ioctl.c')
1 files changed, 2 insertions, 0 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 5963cf91a3a0..d0bb92cbefb9 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -208,6 +208,8 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
rq->timeout = q->sg_timeout;
if (!rq->timeout)
+ if (rq->timeout < BLK_MIN_SG_TIMEOUT)
+ rq->timeout = BLK_MIN_SG_TIMEOUT;
return 0;

Privacy Policy