浏览代码

[SCSI] libsas: Warn if ATA device detected but CONFIG_SCSI_SAS_ATA not set

We give a very cryptic error if an ATA device is seen on a SAS port
but libsas isn't compiled to include libata to handle them.  Add an
extra warning to explain specifically what the problem is.

Acked-by: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
James Bottomley 17 年之前
父节点
当前提交
15c73d5afd
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      drivers/scsi/libsas/sas_discover.c

+ 4 - 1
drivers/scsi/libsas/sas_discover.c

@@ -295,11 +295,14 @@ static void sas_discover_domain(struct work_struct *work)
 	case FANOUT_DEV:
 	case FANOUT_DEV:
 		error = sas_discover_root_expander(dev);
 		error = sas_discover_root_expander(dev);
 		break;
 		break;
-#ifdef CONFIG_SCSI_SAS_ATA
 	case SATA_DEV:
 	case SATA_DEV:
 	case SATA_PM:
 	case SATA_PM:
+#ifdef CONFIG_SCSI_SAS_ATA
 		error = sas_discover_sata(dev);
 		error = sas_discover_sata(dev);
 		break;
 		break;
+#else
+		SAS_DPRINTK("ATA device seen but CONFIG_SCSI_SAS_ATA=N so cannot attach\n");
+		/* Fall through */
 #endif
 #endif
 	default:
 	default:
 		error = -ENXIO;
 		error = -ENXIO;