Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3ce7c6588637614b00072569679791a04898c790

Authored by Boaz Harrosh
Committed by James Bottomley
1 parent 57643c711c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 5 additions and 8 deletions Side-by-side Diff

... ... @@ -837,19 +837,16 @@
837 837  
838 838 /* Phase 4 - Setup scatter/gather buffers */
839 839 case 4:
840   - if (cmd->use_sg) {
841   - /* if many buffers are available, start filling the first */
842   - cmd->SCp.buffer =
843   - (struct scatterlist *) cmd->request_buffer;
  840 + if (scsi_bufflen(cmd)) {
  841 + cmd->SCp.buffer = scsi_sglist(cmd);
844 842 cmd->SCp.this_residual = cmd->SCp.buffer->length;
845 843 cmd->SCp.ptr = sg_virt(cmd->SCp.buffer);
846 844 } else {
847   - /* else fill the only available buffer */
848 845 cmd->SCp.buffer = NULL;
849   - cmd->SCp.this_residual = cmd->request_bufflen;
850   - cmd->SCp.ptr = cmd->request_buffer;
  846 + cmd->SCp.this_residual = 0;
  847 + cmd->SCp.ptr = NULL;
851 848 }
852   - cmd->SCp.buffers_residual = cmd->use_sg - 1;
  849 + cmd->SCp.buffers_residual = scsi_sg_count(cmd) - 1;
853 850 cmd->SCp.phase++;
854 851 if (cmd->SCp.this_residual & 0x01)
855 852 cmd->SCp.this_residual++;