Author: mav
Date: Thu Sep 24 12:22:47 2015
New Revision: 288170
URL: https://svnweb.freebsd.org/changeset/base/288170

Log:
  Add new report types to REPORT LUNS command.
  
  This is only for completeness, since we have nothing new to report there.

Modified:
  head/sys/cam/ctl/ctl.c
  head/sys/cam/scsi/scsi_all.h

Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c      Thu Sep 24 10:31:39 2015        (r288169)
+++ head/sys/cam/ctl/ctl.c      Thu Sep 24 12:22:47 2015        (r288170)
@@ -9265,12 +9265,10 @@ ctl_report_luns(struct ctl_scsiio *ctsio
        struct ctl_port *port;
        int num_luns, retval;
        uint32_t alloc_len, lun_datalen;
-       int num_filled, well_known;
+       int num_filled;
        uint32_t initidx, targ_lun_id, lun_id;
 
        retval = CTL_RETVAL_COMPLETE;
-       well_known = 0;
-
        cdb = (struct scsi_report_luns *)ctsio->cdb;
        port = ctl_io_port(&ctsio->io_hdr);
 
@@ -9287,9 +9285,11 @@ ctl_report_luns(struct ctl_scsiio *ctsio
        switch (cdb->select_report) {
        case RPL_REPORT_DEFAULT:
        case RPL_REPORT_ALL:
+       case RPL_REPORT_NONSUBSID:
                break;
        case RPL_REPORT_WELLKNOWN:
-               well_known = 1;
+       case RPL_REPORT_ADMIN:
+       case RPL_REPORT_CONGLOM:
                num_luns = 0;
                break;
        default:

Modified: head/sys/cam/scsi/scsi_all.h
==============================================================================
--- head/sys/cam/scsi/scsi_all.h        Thu Sep 24 10:31:39 2015        
(r288169)
+++ head/sys/cam/scsi/scsi_all.h        Thu Sep 24 12:22:47 2015        
(r288170)
@@ -2864,6 +2864,9 @@ struct scsi_report_luns
 #define        RPL_REPORT_DEFAULT      0x00
 #define        RPL_REPORT_WELLKNOWN    0x01
 #define        RPL_REPORT_ALL          0x02
+#define        RPL_REPORT_ADMIN        0x10
+#define        RPL_REPORT_NONSUBSID    0x11
+#define        RPL_REPORT_CONGLOM      0x12
        uint8_t select_report;
        uint8_t reserved2[3];
        uint8_t length[4];
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to