Page MenuHomeFreeBSD

D54470.id.diff
No OneTemporary

D54470.id.diff

diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -3711,13 +3711,12 @@
xpt_gdev_type(cgd, csio->ccb_h.path);
/*
- * If the device is unconfigured, just pretend that it is a hard
- * drive. scsi_op_desc() needs this.
+ * If the device is unconfigured, the inq data is invalid.
*/
if (cgd->ccb_h.status == CAM_DEV_NOT_THERE)
- cgd->inq_data.device = T_DIRECT;
-
- inq_data = &cgd->inq_data;
+ inq_data = NULL;
+ else
+ inq_data = &cgd->inq_data;
#else /* !_KERNEL */
@@ -5170,13 +5169,12 @@
xpt_gdev_type(cgd, csio->ccb_h.path);
/*
- * If the device is unconfigured, just pretend that it is a hard
- * drive. scsi_op_desc() needs this.
+ * If the device is unconfigured, the inq data is invalid.
*/
if (cgd->ccb_h.status == CAM_DEV_NOT_THERE)
- cgd->inq_data.device = T_DIRECT;
-
- inq_data = &cgd->inq_data;
+ inq_data = NULL;
+ else
+ inq_data = &cgd->inq_data;
#else /* !_KERNEL */

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 8, 2:03 PM (10 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27577967
Default Alt Text
D54470.id.diff (1006 B)

Event Timeline