Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fix from James Bottomley:
"This is a simple fix for a domain revalidation crash which has
recently turned up in the libsas code (applies to mvsas, isc and
aic94xx)"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
libsas: Fix Kernel Crash in smp_execute_task
+4
-2
+4
-2
drivers/scsi/libsas/sas_discover.c
+4
-2
drivers/scsi/libsas/sas_discover.c
···
500
500
struct sas_discovery_event *ev = to_sas_discovery_event(work);
501
501
struct asd_sas_port *port = ev->port;
502
502
struct sas_ha_struct *ha = port->ha;
503
+
struct domain_device *ddev = port->port_dev;
503
504
504
505
/* prevent revalidation from finding sata links in recovery */
505
506
mutex_lock(&ha->disco_mutex);
···
515
514
SAS_DPRINTK("REVALIDATING DOMAIN on port %d, pid:%d\n", port->id,
516
515
task_pid_nr(current));
517
516
518
-
if (port->port_dev)
519
-
res = sas_ex_revalidate_domain(port->port_dev);
517
+
if (ddev && (ddev->dev_type == SAS_FANOUT_EXPANDER_DEVICE ||
518
+
ddev->dev_type == SAS_EDGE_EXPANDER_DEVICE))
519
+
res = sas_ex_revalidate_domain(ddev);
520
520
521
521
SAS_DPRINTK("done REVALIDATING DOMAIN on port %d, pid:%d, res 0x%x\n",
522
522
port->id, task_pid_nr(current), res);