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

Commit 8dd903d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fix from James Bottomley:
 "One fix for SAS attached SATA CD-ROMs. It turns out that the libata
  handling of CD devices relies on the SCSI error handler, so disable
  async aborts (which don't start the error handler) for these devices"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: libsas: Disable asynchronous aborts for SATA devices
parents 1cf55613 c9f92600

drivers/scsi/libsas/sas_scsi_host.c

+15 −2
Original line number Diff line number Diff line
@@ -486,15 +486,28 @@ static int sas_queue_reset(struct domain_device *dev, int reset_type, 


int sas_eh_abort_handler(struct scsi_cmnd *cmd)

{

	int res;

	int res = TMF_RESP_FUNC_FAILED;

	struct sas_task *task = TO_SAS_TASK(cmd);

	struct Scsi_Host *host = cmd->device->host;

	struct domain_device *dev = cmd_to_domain_dev(cmd);

	struct sas_internal *i = to_sas_internal(host->transportt);

	unsigned long flags;



	if (!i->dft->lldd_abort_task)

		return FAILED;



	spin_lock_irqsave(host->host_lock, flags);

	/* We cannot do async aborts for SATA devices */

	if (dev_is_sata(dev) && !host->host_eh_scheduled) {

		spin_unlock_irqrestore(host->host_lock, flags);

		return FAILED;

	}

	spin_unlock_irqrestore(host->host_lock, flags);



	if (task)

		res = i->dft->lldd_abort_task(task);

	else

		SAS_DPRINTK("no task to abort\n");

	if (res == TMF_RESP_FUNC_SUCC || res == TMF_RESP_FUNC_COMPLETE)

		return SUCCESS;