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

[Alexander Motin]

Author: mav
Date: Fri Jan 30 09:04:20 2015
New Revision: 277918
URL: https://svnweb.freebsd.org/changeset/base/277918

Log:
  MFC r277529: Don't count requests with status sent as overlapping.
  
  While those requests are still in target OOA queue, for initiator they are
  already completed, so tags can be reused.

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	Fri Jan 30 05:23:39 2015	(r277917)
+++ stable/10/sys/cam/ctl/ctl.c	Fri Jan 30 09:04:20 2015	(r277918)
@@ -10828,7 +10828,8 @@ ctl_check_for_blockage(struct ctl_lun *l
 	      ooa_io->io_hdr.nexus.targ_port)
 	  && (pending_io->io_hdr.nexus.initid.id ==
 	      ooa_io->io_hdr.nexus.initid.id))
-	 && ((ooa_io->io_hdr.flags & CTL_FLAG_ABORT) == 0))
+	 && ((ooa_io->io_hdr.flags & (CTL_FLAG_ABORT |
+	      CTL_FLAG_STATUS_SENT)) == 0))
 		return (CTL_ACTION_OVERLAP);
 
 	/*
@@ -10849,7 +10850,8 @@ ctl_check_for_blockage(struct ctl_lun *l
 	      ooa_io->io_hdr.nexus.targ_port)
 	  && (pending_io->io_hdr.nexus.initid.id ==
 	      ooa_io->io_hdr.nexus.initid.id))
-	 && ((ooa_io->io_hdr.flags & CTL_FLAG_ABORT) == 0))
+	 && ((ooa_io->io_hdr.flags & (CTL_FLAG_ABORT |
+	      CTL_FLAG_STATUS_SENT)) == 0))
 		return (CTL_ACTION_OVERLAP_TAG);
 
 	/*