Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23edb6e7 authored by nagalakshmi.nandigama@lsi.com's avatar nagalakshmi.nandigama@lsi.com Committed by James Bottomley
Browse files

[SCSI] mpt2sas: Do not set sas_device->starget to NULL from the slave_destroy... 


[SCSI] mpt2sas: Do not set sas_device->starget to NULL from the slave_destroy callback when all the LUNS have been deleted

If the sas_device->starget to NULL from slave_destroy callback for LUN=1
even though LUN=0 exist, results in entire target getting deleted.
To resolve the issue, the driver should only set sas_device->starget to
NULL when all the LUNS have been deleted from the slave_destroy.

Signed-off-by: default avatarNagalakshmi Nandigama <nagalakshmi.nandigama@lsi.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent c1bc0704

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+12 −8
Original line number Diff line number Diff line
@@ -613,6 +613,10 @@ _scsih_sas_device_add(struct MPT2SAS_ADAPTER *ioc, 
	     sas_device->sas_address_parent)) {

		_scsih_sas_device_remove(ioc, sas_device);

	} else if (!sas_device->starget) {

		/* When asyn scanning is enabled, its not possible to remove

		 * devices while scanning is turned on due to an oops in

		 * scsi_sysfs_add_sdev()->add_device()->sysfs_addrm_start()

		 */

		if (!ioc->is_driver_loading)

			mpt2sas_transport_port_remove(ioc,

			sas_device->sas_address,
@@ -1449,7 +1453,7 @@ _scsih_slave_destroy(struct scsi_device *sdev) 
		spin_lock_irqsave(&ioc->sas_device_lock, flags);

		sas_device = mpt2sas_scsih_sas_device_find_by_sas_address(ioc,

		   sas_target_priv_data->sas_address);

		if (sas_device)

		if (sas_device && !sas_target_priv_data->num_luns)

			sas_device->starget = NULL;

		spin_unlock_irqrestore(&ioc->sas_device_lock, flags);

	}