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

[SCSI] fas216: Use scsi_eh API for REQUEST_SENSE invocation

Browse Source 
Use new scsi_eh_prep/restor_cmnd() for synchronous REQUEST_SENSE
invocation.  This also converts the driver to the new accessor based
scatterlist implementation.

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Tested-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Boaz Harrosh
2007-09-10 22:39:11 +03:00
committed by James Bottomley
parent 7c46c20aef
commit ccf9ea91ab
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/scsi/arm/fas216.c
View File

@@ -2018,6 +2018,7 @@ static void fas216_rq_sns_done(FAS216_Info *info, struct scsi_cmnd *SCpnt,
* the upper layers to process. This would have been set * the upper layers to process. This would have been set
* correctly by fas216_std_done. * correctly by fas216_std_done.
*/ */
scsi_eh_restore_cmnd(SCpnt, &info->ses);
SCpnt->scsi_done(SCpnt); SCpnt->scsi_done(SCpnt);
} }
@@ -2103,23 +2104,12 @@ request_sense:
if (SCpnt->cmnd[0] == REQUEST_SENSE) if (SCpnt->cmnd[0] == REQUEST_SENSE)
goto done; goto done;
scsi_eh_prep_cmnd(SCpnt, &info->ses, NULL, 0, ~0);
fas216_log_target(info, LOG_CONNECT, SCpnt->device->id, fas216_log_target(info, LOG_CONNECT, SCpnt->device->id,
"requesting sense"); "requesting sense");
memset(SCpnt->cmnd, 0, sizeof (SCpnt->cmnd)); init_SCp(SCpnt);
SCpnt->cmnd[0] = REQUEST_SENSE;
SCpnt->cmnd[1] = SCpnt->device->lun << 5;
SCpnt->cmnd[4] = sizeof(SCpnt->sense_buffer);
SCpnt->cmd_len = COMMAND_SIZE(SCpnt->cmnd[0]);
SCpnt->SCp.buffer = NULL;
SCpnt->SCp.buffers_residual = 0;
SCpnt->SCp.ptr = (char *)SCpnt->sense_buffer;
SCpnt->SCp.this_residual = sizeof(SCpnt->sense_buffer);
SCpnt->SCp.phase = sizeof(SCpnt->sense_buffer);
SCpnt->SCp.Message = 0; SCpnt->SCp.Message = 0;
SCpnt->SCp.Status = 0; SCpnt->SCp.Status = 0;
SCpnt->request_bufflen = sizeof(SCpnt->sense_buffer);
SCpnt->sc_data_direction = DMA_FROM_DEVICE;
SCpnt->use_sg = 0;
SCpnt->tag = 0; SCpnt->tag = 0;
SCpnt->host_scribble = (void *)fas216_rq_sns_done; SCpnt->host_scribble = (void *)fas216_rq_sns_done;

3
drivers/scsi/arm/fas216.h
View File

@@ -16,6 +16,8 @@
#define NO_IRQ 255 #define NO_IRQ 255
#endif #endif
#include <scsi/scsi_eh.h>
#include "queue.h" #include "queue.h"
#include "msgqueue.h" #include "msgqueue.h"
@@ -311,6 +313,7 @@ typedef struct {
/* miscellaneous */ /* miscellaneous */
int internal_done; /* flag to indicate request done */ int internal_done; /* flag to indicate request done */
struct scsi_eh_save *ses; /* holds request sense restore info */
unsigned long magic_end; unsigned long magic_end;
} FAS216_Info; } FAS216_Info;