Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 47759
b: refs/heads/master
c: dca84e4
h: refs/heads/master
i:
  47757: 64d0ca6
  47755: adfda8d
  47751: ac9456f
  47743: 3b1bb3d
v: v3
  • Loading branch information
Darrick J. Wong authored and James Bottomley committed Jan 27, 2007
1 parent 7b63502 commit fdb8198
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 21434966462d57145c861b43f6206d945ac57630
refs/heads/master: dca84e4694419adf61ad052b1e5a50ac82726597
12 changes: 7 additions & 5 deletions trunk/drivers/scsi/scsi_error.c
Original file line number Diff line number Diff line change
Expand Up @@ -672,8 +672,8 @@ EXPORT_SYMBOL(scsi_eh_finish_cmd);
* XXX: Long term this code should go away, but that needs an audit of
* all LLDDs first.
**/
static int scsi_eh_get_sense(struct list_head *work_q,
struct list_head *done_q)
int scsi_eh_get_sense(struct list_head *work_q,
struct list_head *done_q)
{
struct scsi_cmnd *scmd, *next;
int rtn;
Expand Down Expand Up @@ -715,6 +715,7 @@ static int scsi_eh_get_sense(struct list_head *work_q,

return list_empty(work_q);
}
EXPORT_SYMBOL_GPL(scsi_eh_get_sense);

/**
* scsi_try_to_abort_cmd - Ask host to abort a running command.
Expand Down Expand Up @@ -1411,16 +1412,17 @@ static void scsi_restart_operations(struct Scsi_Host *shost)
* @eh_done_q: list_head for processed commands.
*
**/
static void scsi_eh_ready_devs(struct Scsi_Host *shost,
struct list_head *work_q,
struct list_head *done_q)
void scsi_eh_ready_devs(struct Scsi_Host *shost,
struct list_head *work_q,
struct list_head *done_q)
{
if (!scsi_eh_stu(shost, work_q, done_q))
if (!scsi_eh_bus_device_reset(shost, work_q, done_q))
if (!scsi_eh_bus_reset(shost, work_q, done_q))
if (!scsi_eh_host_reset(work_q, done_q))
scsi_eh_offline_sdevs(work_q, done_q);
}
EXPORT_SYMBOL_GPL(scsi_eh_ready_devs);

/**
* scsi_eh_flush_done_q - finish processed commands or retry them.
Expand Down
5 changes: 5 additions & 0 deletions trunk/drivers/scsi/scsi_priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ extern int scsi_error_handler(void *host);
extern int scsi_decide_disposition(struct scsi_cmnd *cmd);
extern void scsi_eh_wakeup(struct Scsi_Host *shost);
extern int scsi_eh_scmd_add(struct scsi_cmnd *, int);
void scsi_eh_ready_devs(struct Scsi_Host *shost,
struct list_head *work_q,
struct list_head *done_q);
int scsi_eh_get_sense(struct list_head *work_q,
struct list_head *done_q);

/* scsi_lib.c */
extern int scsi_maybe_unblock_host(struct scsi_device *sdev);
Expand Down

0 comments on commit fdb8198

Please sign in to comment.