Merge ../linux-2.6
This commit is contained in:
@@ -581,8 +581,7 @@ static int scsi_request_sense(struct scsi_cmnd *scmd)
|
||||
* keep a list of pending commands for final completion, and once we
|
||||
* are ready to leave error handling we handle completion for real.
|
||||
**/
|
||||
static void scsi_eh_finish_cmd(struct scsi_cmnd *scmd,
|
||||
struct list_head *done_q)
|
||||
void scsi_eh_finish_cmd(struct scsi_cmnd *scmd, struct list_head *done_q)
|
||||
{
|
||||
scmd->device->host->host_failed--;
|
||||
scmd->eh_eflags = 0;
|
||||
@@ -594,6 +593,7 @@ static void scsi_eh_finish_cmd(struct scsi_cmnd *scmd,
|
||||
scsi_setup_cmd_retry(scmd);
|
||||
list_move_tail(&scmd->eh_entry, done_q);
|
||||
}
|
||||
EXPORT_SYMBOL(scsi_eh_finish_cmd);
|
||||
|
||||
/**
|
||||
* scsi_eh_get_sense - Get device sense data.
|
||||
@@ -1422,7 +1422,7 @@ static void scsi_eh_ready_devs(struct Scsi_Host *shost,
|
||||
* @done_q: list_head of processed commands.
|
||||
*
|
||||
**/
|
||||
static void scsi_eh_flush_done_q(struct list_head *done_q)
|
||||
void scsi_eh_flush_done_q(struct list_head *done_q)
|
||||
{
|
||||
struct scsi_cmnd *scmd, *next;
|
||||
|
||||
@@ -1451,6 +1451,7 @@ static void scsi_eh_flush_done_q(struct list_head *done_q)
|
||||
}
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL(scsi_eh_flush_done_q);
|
||||
|
||||
/**
|
||||
* scsi_unjam_host - Attempt to fix a host which has a cmd that failed.
|
||||
|
Reference in New Issue
Block a user