From 97a78789ea8198e8b4b6ed16d10c175869c0138f Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 21 Jul 2010 10:29:37 +0900 Subject: [PATCH] --- yaml --- r: 208317 b: refs/heads/master c: 6a32a8aed509e71137043d464db4a7fcd88c903e h: refs/heads/master i: 208315: 2da3e33677b0dd7010972712a52981178a1061b0 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sd.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 842a0cd793bf..42ea32698a16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8112586063fe53958d60218631d661533f304504 +refs/heads/master: 6a32a8aed509e71137043d464db4a7fcd88c903e diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c index fc5d69a84af5..e63b85ac8cd1 100644 --- a/trunk/drivers/scsi/sd.c +++ b/trunk/drivers/scsi/sd.c @@ -434,7 +434,6 @@ static int scsi_setup_discard_cmnd(struct scsi_device *sdp, struct request *rq) nr_sectors >>= 3; } - rq->cmd_type = REQ_TYPE_BLOCK_PC; rq->timeout = SD_TIMEOUT; memset(rq->cmd, 0, rq->cmd_len); @@ -1200,6 +1199,12 @@ static int sd_done(struct scsi_cmnd *SCpnt) int sense_valid = 0; int sense_deferred = 0; + if (SCpnt->request->cmd_flags & REQ_DISCARD) { + if (!result) + scsi_set_resid(SCpnt, 0); + return good_bytes; + } + if (result) { sense_valid = scsi_command_normalize_sense(SCpnt, &sshdr); if (sense_valid)