From 3b3adefbea52de3850f2c10ce6f178513d4a620d Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Wed, 11 Aug 2010 11:06:25 -0500 Subject: [PATCH] --- yaml --- r: 213321 b: refs/heads/master c: e3b3e6246726cd05950677ed843010b8e8c5884c h: refs/heads/master i: 213319: e702436dbada9564b64cbc7d6f97103af0d9b0d7 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sd.c | 4 ++-- trunk/drivers/scsi/sd.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index faaec68fc6b4..fe9dcee50968 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c1acab0367d88ad5da2b9db2efdf2699113ec88 +refs/heads/master: e3b3e6246726cd05950677ed843010b8e8c5884c diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c index 2714becc2eaf..8c9b275f71a7 100644 --- a/trunk/drivers/scsi/sd.c +++ b/trunk/drivers/scsi/sd.c @@ -477,7 +477,7 @@ static int scsi_setup_discard_cmnd(struct scsi_device *sdp, struct request *rq) static int scsi_setup_flush_cmnd(struct scsi_device *sdp, struct request *rq) { - rq->timeout = SD_TIMEOUT; + rq->timeout = SD_FLUSH_TIMEOUT; rq->retries = SD_MAX_RETRIES; rq->cmd[0] = SYNCHRONIZE_CACHE; rq->cmd_len = 10; @@ -1072,7 +1072,7 @@ static int sd_sync_cache(struct scsi_disk *sdkp) * flush everything. */ res = scsi_execute_req(sdp, cmd, DMA_NONE, NULL, 0, &sshdr, - SD_TIMEOUT, SD_MAX_RETRIES, NULL); + SD_FLUSH_TIMEOUT, SD_MAX_RETRIES, NULL); if (res == 0) break; } diff --git a/trunk/drivers/scsi/sd.h b/trunk/drivers/scsi/sd.h index f81a9309e6de..315ce9d96b1f 100644 --- a/trunk/drivers/scsi/sd.h +++ b/trunk/drivers/scsi/sd.h @@ -19,6 +19,7 @@ */ #define SD_TIMEOUT (30 * HZ) #define SD_MOD_TIMEOUT (75 * HZ) +#define SD_FLUSH_TIMEOUT (60 * HZ) /* * Number of allowed retries