11_scsi_make_requeue_command_public.patch
Add reprep argument to scsi_requeue_command(), remove
redundant q argument, add code to set cmd->state/owner, and
make the function public. This patch is preparation for
consolidating requeue paths.
Signed-off-by: Tejun Heo <[EMAIL PROTECTED]>
scsi_lib.c | 23 ++++++++++++++---------
scsi_priv.h | 1 +
2 files changed, 15 insertions(+), 9 deletions(-)
Index: scsi-export/drivers/scsi/scsi_lib.c
===================================================================
--- scsi-export.orig/drivers/scsi/scsi_lib.c 2005-03-31 18:06:22.000000000
+0900
+++ scsi-export/drivers/scsi/scsi_lib.c 2005-03-31 18:06:22.000000000 +0900
@@ -466,8 +466,8 @@ void scsi_device_unbusy(struct scsi_devi
*
* Purpose: Handle post-processing of completed commands.
*
- * Arguments: q - queue to operate on
- * cmd - command that may need to be requeued.
+ * Arguments: cmd - command that may need to be requeued.
+ * reprep - needs to prep the command again?
*
* Returns: Nothing
*
@@ -478,11 +478,16 @@ void scsi_device_unbusy(struct scsi_devi
* we need to request the blocks that come after the bad
* sector.
*/
-static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd
*cmd)
+void scsi_requeue_command(struct scsi_cmnd *cmd, int reprep)
{
+ struct request_queue *q = cmd->device->request_queue;
unsigned long flags;
- cmd->request->flags &= ~REQ_DONTPREP;
+ cmd->state = SCSI_STATE_MLQUEUE;
+ cmd->owner = SCSI_OWNER_MIDLEVEL;
+
+ if (reprep)
+ cmd->request->flags &= ~REQ_DONTPREP;
cmd->request->flags |= REQ_SOFTBARRIER;
spin_lock_irqsave(q->queue_lock, flags);
@@ -556,7 +561,7 @@ static struct scsi_cmnd *scsi_end_reques
* leftovers in the front of the
* queue, and goose the queue again.
*/
- scsi_requeue_command(q, cmd);
+ scsi_requeue_command(cmd, 1);
return cmd;
}
@@ -818,7 +823,7 @@ void scsi_io_completion(struct scsi_cmnd
* media change, so we just retry the
* request and see what happens.
*/
- scsi_requeue_command(q, cmd);
+ scsi_requeue_command(cmd, 1);
return;
}
break;
@@ -839,7 +844,7 @@ void scsi_io_completion(struct scsi_cmnd
* This will cause a retry with a 6-byte
* command.
*/
- scsi_requeue_command(q, cmd);
+ scsi_requeue_command(cmd, 1);
result = 0;
} else {
cmd = scsi_end_request(cmd, 0, this_count, 1);
@@ -852,7 +857,7 @@ void scsi_io_completion(struct scsi_cmnd
* retry.
*/
if (sshdr.asc == 0x04 && sshdr.ascq == 0x01) {
- scsi_requeue_command(q, cmd);
+ scsi_requeue_command(cmd, 1);
return;
}
printk(KERN_INFO "Device %s not ready.\n",
@@ -878,7 +883,7 @@ void scsi_io_completion(struct scsi_cmnd
* recovery reasons. Just retry the request
* and see what happens.
*/
- scsi_requeue_command(q, cmd);
+ scsi_requeue_command(cmd, 1);
return;
}
if (result) {
Index: scsi-export/drivers/scsi/scsi_priv.h
===================================================================
--- scsi-export.orig/drivers/scsi/scsi_priv.h 2005-03-31 18:06:20.000000000
+0900
+++ scsi-export/drivers/scsi/scsi_priv.h 2005-03-31 18:06:22.000000000
+0900
@@ -96,6 +96,7 @@ extern int scsi_maybe_unblock_host(struc
extern void scsi_setup_cmd_retry(struct scsi_cmnd *cmd);
extern void scsi_device_unbusy(struct scsi_device *sdev);
extern int scsi_queue_insert(struct scsi_cmnd *cmd, int reason);
+extern void scsi_requeue_command(struct scsi_cmnd *cmd, int reprep);
extern void scsi_next_command(struct scsi_cmnd *cmd);
extern void scsi_run_host_queues(struct Scsi_Host *shost);
extern struct request_queue *scsi_alloc_queue(struct scsi_device *sdev);
-
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
