On Wed, 2013-06-05 at 11:42 +0200, Willy Tarreau wrote:
> 2.6.32-longterm review patch. If anyone has any objections, please let me know.
> Thanks to Moritz for spotting this missing patch from the series.
>
> ------------------
>
> From: "Kashyap, Desai" <kashyap.desai@xxxxxxx>
commit ebda4d38df542e1ff4747c4daadfc7da250b4fa6 upstream.
> RAID_SCSI_IO_PASSTHROUGH: Driver needs to be sending the default
> descriptor for RAID Passthru, currently its sending SCSI_IO descriptor.
>
> Signed-off-by: Kashyap Desai <kashyap.desai@xxxxxxx>
> Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>
> ---
> drivers/scsi/mpt2sas/mpt2sas_ctl.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
> index ddaa99c..d88e975 100644
> --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
> +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
> @@ -744,8 +744,11 @@ _ctl_do_mpt_command(struct MPT2SAS_ADAPTER *ioc,
> mpt2sas_base_get_sense_buffer_dma(ioc, smid);
> priv_sense = mpt2sas_base_get_sense_buffer(ioc, smid);
> memset(priv_sense, 0, SCSI_SENSE_BUFFERSIZE);
> - mpt2sas_base_put_smid_scsi_io(ioc, smid,
> - le16_to_cpu(mpi_request->FunctionDependent1));
> + if (mpi_request->Function == MPI2_FUNCTION_SCSI_IO_REQUEST)
> + mpt2sas_base_put_smid_scsi_io(ioc, smid,
> + le16_to_cpu(mpi_request->FunctionDependent1));
> + else
> + mpt2sas_base_put_smid_default(ioc, smid);
> break;
> }
> case MPI2_FUNCTION_SCSI_TASK_MGMT:
--
Ben Hutchings
Theory and practice are closer in theory than in practice.
- John Levine, moderator of comp.compilers
Attachment:
signature.asc
Description: This is a digitally signed message part