kill scsi_rety_command
PATCH 1/1 kill scsi_rety_command
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 <[email protected]>
drivers/scsi/scsi.c +0 -21
@@ -673,27 +673,6 @@ }/* -* 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 * * Purpose: Pass command off to upper layer for finishing of I/O
drivers/scsi/scsi_lib.c +1 -1
@@ -1400,7 +1400,7 @@scsi_finish_command (cmd);break ;case NEEDS_RETRY : -scsi_retry_command (cmd); +scsi_queue_insert (cmd,SCSI_MLQUEUE_EH_RETRY );break ;case ADD_TO_MLQUEUE :scsi_queue_insert (cmd,SCSI_MLQUEUE_DEVICE_BUSY );
drivers/scsi/scsi_priv.h +0 -1
@@ -28,7 +28,6 @@extern int scsi_setup_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 int scsi_retry_command (struct scsi_cmnd *cmd);#ifdef CONFIG_SCSI_LOGGING void scsi_log_send (struct scsi_cmnd *cmd);void scsi_log_completion (struct scsi_cmnd *cmd,int disposition);