03_scsi_REQ_SPECIAL_semantic_scsi_requeue_command.patch

        scsi_requeue_request() used to use blk_insert_request() for
        requeueing requests.  This behavior depends on the unobvious
        behavior of blk_insert_request() setting REQ_SPECIAL and
        REQ_SOFTBARRIER when requeueing.  This patch makes
        scsi_requeue_request() use blk_requeue_request() and
        explicitly set REQ_SOFTBARRIER.  As REQ_SPECIAL now means
        special requests, the flag is not set on requeue.

Signed-off-by: Tejun Heo <[EMAIL PROTECTED]>

 scsi_lib.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

Index: scsi-reqfn-export/drivers/scsi/scsi_lib.c
===================================================================
--- scsi-reqfn-export.orig/drivers/scsi/scsi_lib.c      2005-04-11 
12:27:07.000000000 +0900
+++ scsi-reqfn-export/drivers/scsi/scsi_lib.c   2005-04-11 12:27:08.000000000 
+0900
@@ -483,8 +483,14 @@ static void scsi_run_queue(struct reques
  */
 static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd 
*cmd)
 {
+       unsigned long flags;
+
        cmd->request->flags &= ~REQ_DONTPREP;
-       blk_insert_request(q, cmd->request, 1, cmd, 1);
+       cmd->request->flags |= REQ_SOFTBARRIER;
+
+       spin_lock_irqsave(q->queue_lock, flags);
+       blk_requeue_request(q, cmd->request);
+       spin_unlock_irqrestore(q->queue_lock, flags);
 
        scsi_run_queue(q);
 }

-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to