summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2010-07-01 19:49:19 +0900
committerJens Axboe <jaxboe@fusionio.com>2010-08-07 18:23:51 +0200
commit802447c1c0513a0ea0e29d6bda23b19ac0686654 (patch)
tree9504fcb73862dc97534d0300f8adb87c0c65d002 /drivers/scsi
parentf1126e950d28ff875d96ed6a04a9ff96c7bfc357 (diff)
scsi: remove unused free discard page in sd_done
- sd_done isn't called for pc request so we never call the code. - we use sd_unprep to free discard page now. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/sd.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 2d4e3a865f3..aa6b48ba78b 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1179,15 +1179,6 @@ static int sd_done(struct scsi_cmnd *SCpnt)
int sense_valid = 0;
int sense_deferred = 0;
- /*
- * If this is a discard request that originated from the kernel
- * we need to free our payload here. Note that we need to check
- * the request flag as the normal payload rules apply for
- * pass-through UNMAP / WRITE SAME requests.
- */
- if (SCpnt->request->cmd_flags & REQ_DISCARD)
- __free_page(bio_page(SCpnt->request->bio));
-
if (result) {
sense_valid = scsi_command_normalize_sense(SCpnt, &sshdr);
if (sense_valid)