You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[SCSI] replace sizeof sense_buffer with SCSI_SENSE_BUFFERSIZE
This replaces sizeof sense_buffer with SCSI_SENSE_BUFFERSIZE in several LLDs. It's a preparation for the future changes to remove sense_buffer array in scsi_cmnd structure. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
committed by
James Bottomley
parent
94aa5e5f62
commit
b80ca4f7ee
@@ -1629,8 +1629,7 @@ static u8 start_scsi(struct AdapterCtlBlk* acb, struct DeviceCtlBlk* dcb,
|
||||
DC395x_write8(acb, TRM_S1040_SCSI_FIFO, (dcb->target_lun << 5));
|
||||
DC395x_write8(acb, TRM_S1040_SCSI_FIFO, 0);
|
||||
DC395x_write8(acb, TRM_S1040_SCSI_FIFO, 0);
|
||||
DC395x_write8(acb, TRM_S1040_SCSI_FIFO,
|
||||
sizeof(srb->cmd->sense_buffer));
|
||||
DC395x_write8(acb, TRM_S1040_SCSI_FIFO, SCSI_SENSE_BUFFERSIZE);
|
||||
DC395x_write8(acb, TRM_S1040_SCSI_FIFO, 0);
|
||||
} else {
|
||||
ptr = (u8 *)srb->cmd->cmnd;
|
||||
@@ -1915,8 +1914,7 @@ static void command_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,
|
||||
DC395x_write8(acb, TRM_S1040_SCSI_FIFO, (dcb->target_lun << 5));
|
||||
DC395x_write8(acb, TRM_S1040_SCSI_FIFO, 0);
|
||||
DC395x_write8(acb, TRM_S1040_SCSI_FIFO, 0);
|
||||
DC395x_write8(acb, TRM_S1040_SCSI_FIFO,
|
||||
sizeof(srb->cmd->sense_buffer));
|
||||
DC395x_write8(acb, TRM_S1040_SCSI_FIFO, SCSI_SENSE_BUFFERSIZE);
|
||||
DC395x_write8(acb, TRM_S1040_SCSI_FIFO, 0);
|
||||
}
|
||||
srb->state |= SRB_COMMAND;
|
||||
@@ -3685,7 +3683,7 @@ static void request_sense(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
|
||||
srb->target_status = 0;
|
||||
|
||||
/* KG: Can this prevent crap sense data ? */
|
||||
memset(cmd->sense_buffer, 0, sizeof(cmd->sense_buffer));
|
||||
memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
|
||||
|
||||
/* Save some data */
|
||||
srb->segment_x[DC395x_MAX_SG_LISTENTRY - 1].address =
|
||||
@@ -3694,15 +3692,15 @@ static void request_sense(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
|
||||
srb->segment_x[0].length;
|
||||
srb->xferred = srb->total_xfer_length;
|
||||
/* srb->segment_x : a one entry of S/G list table */
|
||||
srb->total_xfer_length = sizeof(cmd->sense_buffer);
|
||||
srb->segment_x[0].length = sizeof(cmd->sense_buffer);
|
||||
srb->total_xfer_length = SCSI_SENSE_BUFFERSIZE;
|
||||
srb->segment_x[0].length = SCSI_SENSE_BUFFERSIZE;
|
||||
/* Map sense buffer */
|
||||
srb->segment_x[0].address =
|
||||
pci_map_single(acb->dev, cmd->sense_buffer,
|
||||
sizeof(cmd->sense_buffer), PCI_DMA_FROMDEVICE);
|
||||
SCSI_SENSE_BUFFERSIZE, PCI_DMA_FROMDEVICE);
|
||||
dprintkdbg(DBG_SG, "request_sense: map buffer %p->%08x(%05x)\n",
|
||||
cmd->sense_buffer, srb->segment_x[0].address,
|
||||
sizeof(cmd->sense_buffer));
|
||||
SCSI_SENSE_BUFFERSIZE);
|
||||
srb->sg_count = 1;
|
||||
srb->sg_index = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user