Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 041c5fc3 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] SCSI: export scsi_eh_finish_cmd() and scsi_eh_flush_done_q() 



Export two SCSI EH command handling functions.  To be used by libata EH.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 9a3d9eb0

drivers/scsi/scsi_error.c

+4 −3
Original line number Diff line number Diff line
@@ -584,8 +584,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;
@@ -597,6 +596,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.
@@ -1425,7 +1425,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;
@@ -1454,6 +1454,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.

include/scsi/scsi_eh.h

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ static inline int scsi_sense_valid(struct scsi_sense_hdr *sshdr) 
}





extern void scsi_eh_finish_cmd(struct scsi_cmnd *scmd,

			       struct list_head *done_q);

extern void scsi_eh_flush_done_q(struct list_head *done_q);

extern void scsi_report_bus_reset(struct Scsi_Host *, int);

extern void scsi_report_device_reset(struct Scsi_Host *, int, int);

extern int scsi_block_when_processing_errors(struct scsi_device *);