Author: mav
Date: Thu Jun 25 07:08:46 2015
New Revision: 284795
URL: https://svnweb.freebsd.org/changeset/base/284795
Log:
MFC r284641:
Fix REPORT LUNS command output for the case when same LUN mapped to same
port several times. While it is unusual configuration, it is not illegal.
Modified:
stable/10/sys/cam/ctl/ctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c Thu Jun 25 07:07:32 2015 (r284794)
+++ stable/10/sys/cam/ctl/ctl.c Thu Jun 25 07:08:46 2015 (r284795)
@@ -9452,11 +9452,16 @@ ctl_report_luns(struct ctl_scsiio *ctsio
well_known = 0;
cdb = (struct scsi_report_luns *)ctsio->cdb;
+ port = ctl_io_port(&ctsio->io_hdr);
CTL_DEBUG_PRINT(("ctl_report_luns\n"));
mtx_lock(&softc->ctl_lock);
- num_luns = softc->num_luns;
+ num_luns = 0;
+ for (targ_lun_id = 0; targ_lun_id < CTL_MAX_LUNS; targ_lun_id++) {
+ if (ctl_lun_map_from_port(port, targ_lun_id) < CTL_MAX_LUNS)
+ num_luns++;
+ }
mtx_unlock(&softc->ctl_lock);
switch (cdb->select_report) {
@@ -9499,7 +9504,6 @@ ctl_report_luns(struct ctl_scsiio *ctsio
request_lun = (struct ctl_lun *)
ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
- port = ctl_io_port(&ctsio->io_hdr);
lun_datalen = sizeof(*lun_data) +
(num_luns * sizeof(struct scsi_report_luns_lundata));
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
