lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] kill scsi_rety_command

Browse Source 
scsi_retry_command only has a single caller, so there is no point
in having this function.  Additionally the memset of the sense
buffer it does is entirely superflous as scsi_request_fn already
calls scsi_init_cmd_errh to perform this memset before the command
is reissued.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Christoph Hellwig
2007-01-02 12:56:00 +01:00
committed by James Bottomley
parent c27d85f3f3
commit 596f482a90
3 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/scsi/scsi.c
View File

@@ -672,27 +672,6 @@ void __scsi_done(struct scsi_cmnd *cmd)
blk_complete_request(rq); blk_complete_request(rq);
} }
/*
* Function: scsi_retry_command
*
* Purpose: Send a command back to the low level to be retried.
*
* Notes: This command is always executed in the context of the
* bottom half handler, or the error handler thread. Low
* level drivers should not become re-entrant as a result of
* this.
*/
int scsi_retry_command(struct scsi_cmnd *cmd)
{
/*
* Zero the sense information from the last time we tried
* this command.
*/
memset(cmd->sense_buffer, 0, sizeof(cmd->sense_buffer));
return scsi_queue_insert(cmd, SCSI_MLQUEUE_EH_RETRY);
}
/* /*
* Function: scsi_finish_command * Function: scsi_finish_command
* *

2
drivers/scsi/scsi_lib.c
View File

@@ -1400,7 +1400,7 @@ static void scsi_softirq_done(struct request *rq)
scsi_finish_command(cmd); scsi_finish_command(cmd);
break; break;
case NEEDS_RETRY: case NEEDS_RETRY:
scsi_retry_command(cmd); scsi_queue_insert(cmd, SCSI_MLQUEUE_EH_RETRY);
break; break;
case ADD_TO_MLQUEUE: case ADD_TO_MLQUEUE:
scsi_queue_insert(cmd, SCSI_MLQUEUE_DEVICE_BUSY); scsi_queue_insert(cmd, SCSI_MLQUEUE_DEVICE_BUSY);

1
drivers/scsi/scsi_priv.h
View File

@@ -28,7 +28,6 @@ extern int scsi_dispatch_cmd(struct scsi_cmnd *cmd);
extern int scsi_setup_command_freelist(struct Scsi_Host *shost); extern int scsi_setup_command_freelist(struct Scsi_Host *shost);
extern void scsi_destroy_command_freelist(struct Scsi_Host *shost); extern void scsi_destroy_command_freelist(struct Scsi_Host *shost);
extern void __scsi_done(struct scsi_cmnd *cmd); extern void __scsi_done(struct scsi_cmnd *cmd);
extern int scsi_retry_command(struct scsi_cmnd *cmd);
#ifdef CONFIG_SCSI_LOGGING #ifdef CONFIG_SCSI_LOGGING
void scsi_log_send(struct scsi_cmnd *cmd); void scsi_log_send(struct scsi_cmnd *cmd);
void scsi_log_completion(struct scsi_cmnd *cmd, int disposition); void scsi_log_completion(struct scsi_cmnd *cmd, int disposition);