[SCSI] imm: convert to accessors and !use_sg cleanup
- convert to accessors and !use_sg cleanup - Not ready for sg-chaining Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Tested-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
parent
57643c711c
commit
3ce7c65886
|
@ -837,19 +837,16 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)
|
|||
|
||||
/* Phase 4 - Setup scatter/gather buffers */
|
||||
case 4:
|
||||
if (cmd->use_sg) {
|
||||
/* if many buffers are available, start filling the first */
|
||||
cmd->SCp.buffer =
|
||||
(struct scatterlist *) cmd->request_buffer;
|
||||
if (scsi_bufflen(cmd)) {
|
||||
cmd->SCp.buffer = scsi_sglist(cmd);
|
||||
cmd->SCp.this_residual = cmd->SCp.buffer->length;
|
||||
cmd->SCp.ptr = sg_virt(cmd->SCp.buffer);
|
||||
} else {
|
||||
/* else fill the only available buffer */
|
||||
cmd->SCp.buffer = NULL;
|
||||
cmd->SCp.this_residual = cmd->request_bufflen;
|
||||
cmd->SCp.ptr = cmd->request_buffer;
|
||||
cmd->SCp.this_residual = 0;
|
||||
cmd->SCp.ptr = NULL;
|
||||
}
|
||||
cmd->SCp.buffers_residual = cmd->use_sg - 1;
|
||||
cmd->SCp.buffers_residual = scsi_sg_count(cmd) - 1;
|
||||
cmd->SCp.phase++;
|
||||
if (cmd->SCp.this_residual & 0x01)
|
||||
cmd->SCp.this_residual++;
|
||||
|
|
Loading…
Reference in New Issue