From 6c7b90928c5d808da354105c44080b5f8514d9ad Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Thu, 8 Jul 2010 10:16:17 +0200 Subject: [PATCH] --- yaml --- r: 208261 b: refs/heads/master c: 610a63498f7f366031a6327eaaa9963ffa110b2b h: refs/heads/master i: 208259: cd1702e59b1578dbde2eb2b44b2eb604223050ba v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_lib.c | 7 ++----- trunk/drivers/scsi/sd.c | 10 ++++++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 6aa217bc98f2..233818b63eee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e094383b60066996fbc3b53891324e5d2ec858d +refs/heads/master: 610a63498f7f366031a6327eaaa9963ffa110b2b diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c index ee836193f531..b8de389636f8 100644 --- a/trunk/drivers/scsi/scsi_lib.c +++ b/trunk/drivers/scsi/scsi_lib.c @@ -1011,11 +1011,8 @@ int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask) err_exit: scsi_release_buffers(cmd); - if (error == BLKPREP_KILL) - scsi_put_command(cmd); - else /* BLKPREP_DEFER */ - scsi_unprep_request(cmd->request); - + scsi_put_command(cmd); + cmd->request->special = NULL; return error; } EXPORT_SYMBOL(scsi_init_io); diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c index 0994ab63b598..1d0c4b7c3b69 100644 --- a/trunk/drivers/scsi/sd.c +++ b/trunk/drivers/scsi/sd.c @@ -468,6 +468,10 @@ static int scsi_setup_discard_cmnd(struct scsi_device *sdp, struct request *rq) blk_add_request_payload(rq, page, len); ret = scsi_setup_blk_pc_cmnd(sdp, rq); rq->buffer = page_address(page); + if (ret != BLKPREP_OK) { + __free_page(page); + rq->buffer = NULL; + } return ret; } @@ -485,8 +489,10 @@ static int scsi_setup_flush_cmnd(struct scsi_device *sdp, struct request *rq) static void sd_unprep_fn(struct request_queue *q, struct request *rq) { - if (rq->cmd_flags & REQ_DISCARD) - __free_page(virt_to_page(rq->buffer)); + if (rq->cmd_flags & REQ_DISCARD) { + free_page((unsigned long)rq->buffer); + rq->buffer = NULL; + } } /**