diff mbox

[3.19.y-ckt,065/164] megaraid_sas: Expose TAPE drives unconditionally

Message ID 1449075615-20754-66-git-send-email-kamal@canonical.com
State New
Headers show

Commit Message

Kamal Mostafa Dec. 2, 2015, 4:58 p.m. UTC
3.19.8-ckt11 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: "sumit.saxena@avagotech.com" <sumit.saxena@avagotech.com>

commit 0d5b47a724bab0ebaaa933d6ff5e584957aaa188 upstream.

Expose non-disk (TAPE drive, CD-ROM) unconditionally.

Signed-off-by: Sumit Saxena <sumit.saxena@avagotech.com>
Signed-off-by: Kashyap Desai <kashyap.desai@avagotech.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 drivers/scsi/megaraid/megaraid_sas_base.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Sumit Saxena Dec. 2, 2015, 5:09 p.m. UTC | #1
patch- "aed335e megaraid_sas: Make tape drives visible on PERC5
controllers" is must along with current patch. Please consider.

> -----Original Message-----
> From: Kamal Mostafa [mailto:kamal@canonical.com]
> Sent: Wednesday, December 02, 2015 10:29 PM
> To: linux-kernel@vger.kernel.org; stable@vger.kernel.org; kernel-
> team@lists.ubuntu.com
> Cc: Sumit Saxena; Kashyap Desai; Martin K. Petersen; Kamal Mostafa
> Subject: [PATCH 3.19.y-ckt 065/164] megaraid_sas: Expose TAPE drives
> unconditionally
>
> 3.19.8-ckt11 -stable review patch.  If anyone has any objections, please
let me
> know.
>
> ------------------
>
> From: "sumit.saxena@avagotech.com" <sumit.saxena@avagotech.com>
>
> commit 0d5b47a724bab0ebaaa933d6ff5e584957aaa188 upstream.
>
> Expose non-disk (TAPE drive, CD-ROM) unconditionally.
>
> Signed-off-by: Sumit Saxena <sumit.saxena@avagotech.com>
> Signed-off-by: Kashyap Desai <kashyap.desai@avagotech.com>
> Reviewed-by: Tomas Henzl <thenzl@redhat.com>
> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> ---
>  drivers/scsi/megaraid/megaraid_sas_base.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c
> b/drivers/scsi/megaraid/megaraid_sas_base.c
> index e541c6c..70cf60a 100644
> --- a/drivers/scsi/megaraid/megaraid_sas_base.c
> +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
> @@ -1681,8 +1681,9 @@ static int megasas_slave_alloc(struct scsi_device
> *sdev)
>  		pd_index =
>  			(sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL)
> +
>  			sdev->id;
> -		if (instance->pd_list[pd_index].driveState ==
> -					MR_PD_STATE_SYSTEM) {
> +		if ((instance->pd_list[pd_index].driveState ==
> +			MR_PD_STATE_SYSTEM) ||
> +			(instance->pd_list[pd_index].driveType !=
TYPE_DISK)) {
>  			return 0;
>  		}
>  		return -ENXIO;
> --
> 1.9.1
Kamal Mostafa Dec. 2, 2015, 5:39 p.m. UTC | #2
On Wed, 2015-12-02 at 22:39 +0530, Sumit Saxena wrote:
> patch- "aed335e megaraid_sas: Make tape drives visible on PERC5
> controllers" is must along with current patch. Please consider.

Thanks Sumit.  I will pick up aed335e for this 3.19.8-ckt11 release as
well then.

 -Kamal


> > -----Original Message-----
> > From: Kamal Mostafa [mailto:kamal@canonical.com]
> > Sent: Wednesday, December 02, 2015 10:29 PM
> > To: linux-kernel@vger.kernel.org; stable@vger.kernel.org; kernel-
> > team@lists.ubuntu.com
> > Cc: Sumit Saxena; Kashyap Desai; Martin K. Petersen; Kamal Mostafa
> > Subject: [PATCH 3.19.y-ckt 065/164] megaraid_sas: Expose TAPE drives
> > unconditionally
> >
> > 3.19.8-ckt11 -stable review patch.  If anyone has any objections, please
> let me
> > know.
> >
> > ------------------
> >
> > From: "sumit.saxena@avagotech.com" <sumit.saxena@avagotech.com>
> >
> > commit 0d5b47a724bab0ebaaa933d6ff5e584957aaa188 upstream.
> >
> > Expose non-disk (TAPE drive, CD-ROM) unconditionally.
> >
> > Signed-off-by: Sumit Saxena <sumit.saxena@avagotech.com>
> > Signed-off-by: Kashyap Desai <kashyap.desai@avagotech.com>
> > Reviewed-by: Tomas Henzl <thenzl@redhat.com>
> > Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
> > Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
> > Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> > ---
> >  drivers/scsi/megaraid/megaraid_sas_base.c | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c
> > b/drivers/scsi/megaraid/megaraid_sas_base.c
> > index e541c6c..70cf60a 100644
> > --- a/drivers/scsi/megaraid/megaraid_sas_base.c
> > +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
> > @@ -1681,8 +1681,9 @@ static int megasas_slave_alloc(struct scsi_device
> > *sdev)
> >  		pd_index =
> >  			(sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL)
> > +
> >  			sdev->id;
> > -		if (instance->pd_list[pd_index].driveState ==
> > -					MR_PD_STATE_SYSTEM) {
> > +		if ((instance->pd_list[pd_index].driveState ==
> > +			MR_PD_STATE_SYSTEM) ||
> > +			(instance->pd_list[pd_index].driveType !=
> TYPE_DISK)) {
> >  			return 0;
> >  		}
> >  		return -ENXIO;
> > --
> > 1.9.1
>
diff mbox

Patch

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index e541c6c..70cf60a 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -1681,8 +1681,9 @@  static int megasas_slave_alloc(struct scsi_device *sdev)
 		pd_index =
 			(sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL) +
 			sdev->id;
-		if (instance->pd_list[pd_index].driveState ==
-					MR_PD_STATE_SYSTEM) {
+		if ((instance->pd_list[pd_index].driveState ==
+			MR_PD_STATE_SYSTEM) ||
+			(instance->pd_list[pd_index].driveType != TYPE_DISK)) {
 			return 0;
 		}
 		return -ENXIO;