Page MenuHomeFreeBSD

D28454.diff
No OneTemporary

D28454.diff

diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
--- a/sys/cam/ata/ata_da.c
+++ b/sys/cam/ata/ata_da.c
@@ -1880,7 +1880,8 @@
softc->disk->d_close = adaclose;
softc->disk->d_strategy = adastrategy;
softc->disk->d_getattr = adagetattr;
- softc->disk->d_dump = adadump;
+ if (cam_sim_pollable(periph->sim))
+ softc->disk->d_dump = adadump;
softc->disk->d_gone = adadiskgonecb;
softc->disk->d_name = "ada";
softc->disk->d_drv1 = periph;
diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c
--- a/sys/cam/nvme/nvme_da.c
+++ b/sys/cam/nvme/nvme_da.c
@@ -898,7 +898,8 @@
disk->d_strategy = ndastrategy;
disk->d_ioctl = ndaioctl;
disk->d_getattr = ndagetattr;
- disk->d_dump = ndadump;
+ if (cam_sim_pollable(periph->sim))
+ disk->d_dump = ndadump;
disk->d_gone = ndadiskgonecb;
disk->d_name = "nda";
disk->d_drv1 = periph;
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -2849,7 +2849,7 @@
TASK_INIT(&softc->sysctl_task, 0, dasysctlinit, periph);
/*
- * Take an exclusive section lock qon the periph while dastart is called
+ * Take an exclusive section lock on the periph while dastart is called
* to finish the probe. The lock will be dropped in dadone at the end
* of probe. This locks out daopen and daclose from racing with the
* probe.
@@ -2914,7 +2914,8 @@
softc->disk->d_open = daopen;
softc->disk->d_close = daclose;
softc->disk->d_strategy = dastrategy;
- softc->disk->d_dump = dadump;
+ if (cam_sim_pollable(periph->sim))
+ softc->disk->d_dump = dadump;
softc->disk->d_getattr = dagetattr;
softc->disk->d_gone = dadiskgonecb;
softc->disk->d_name = "da";

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 17, 5:16 PM (21 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15841063
Default Alt Text
D28454.diff (1 KB)

Event Timeline