From b017db08fbb403b0214343b0d09a26e260ad00d7 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Wed, 14 Sep 2005 12:57:42 -0400 Subject: [PATCH] --- yaml --- r: 9095 b: refs/heads/master c: 59897dad98d63ac15e1e36fcc3a107c892b1826c h: refs/heads/master i: 9093: dee837c853e9b585a1472e0ca1c7920ef7486433 9091: 7819536345a11ab2b5d8caac522ecd09a64004a6 9087: 671a5c08c00efa1afe64172259119c173b3f8030 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_lib.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fcaa5d9e238d..e036f73758e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d39a942c3f4061d2218dcadf79ce10010dbcdb3c +refs/heads/master: 59897dad98d63ac15e1e36fcc3a107c892b1826c diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c index f9026d08532a..0c6924eecf59 100644 --- a/trunk/drivers/scsi/scsi_lib.c +++ b/trunk/drivers/scsi/scsi_lib.c @@ -140,14 +140,12 @@ static void scsi_unprep_request(struct request *req) * commands. * Notes: This could be called either from an interrupt context or a * normal process context. - * Notes: Upon return, cmd is a stale pointer. */ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason) { struct Scsi_Host *host = cmd->device->host; struct scsi_device *device = cmd->device; struct request_queue *q = device->request_queue; - struct request *req = cmd->request; unsigned long flags; SCSI_LOG_MLQUEUE(1, @@ -188,9 +186,8 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason) * function. The SCSI request function detects the blocked condition * and plugs the queue appropriately. */ - scsi_unprep_request(req); spin_lock_irqsave(q->queue_lock, flags); - blk_requeue_request(q, req); + blk_requeue_request(q, cmd->request); spin_unlock_irqrestore(q->queue_lock, flags); scsi_run_queue(q);