svn commit: r288745 - stable/10/sys/cam/ctl

[Alexander Motin]

Author: mav
Date: Mon Oct  5 09:08:58 2015
New Revision: 288745
URL: https://svnweb.freebsd.org/changeset/base/288745

Log:
  MFC r287748: Make TARGET RESET respect LUN mapping.

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	Mon Oct  5 09:08:06 2015	(r288744)
+++ stable/10/sys/cam/ctl/ctl.c	Mon Oct  5 09:08:58 2015	(r288745)
@@ -11338,6 +11338,7 @@ static int
 ctl_target_reset(struct ctl_softc *softc, union ctl_io *io,
 		 ctl_ua_type ua_type)
 {
+	struct ctl_port *port;
 	struct ctl_lun *lun;
 	int retval;
 
@@ -11358,8 +11359,13 @@ ctl_target_reset(struct ctl_softc *softc
 	retval = 0;
 
 	mtx_lock(&softc->ctl_lock);
-	STAILQ_FOREACH(lun, &softc->lun_list, links)
+	port = softc->ctl_ports[io->io_hdr.nexus.targ_port];
+	STAILQ_FOREACH(lun, &softc->lun_list, links) {
+		if (port != NULL &&
+		    ctl_lun_map_to_port(port, lun->lun) >= CTL_MAX_LUNS)
+			continue;
 		retval += ctl_lun_reset(lun, io, ua_type);
+	}
 	mtx_unlock(&softc->ctl_lock);
 
 	return (retval);