Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 27 Mar 2015 00:42:52 +0000 (UTC)
From:      "Kenneth D. Merry" <ken@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r280722 - stable/10/sys/cam/ctl
Message-ID:  <201503270042.t2R0gqFQ095836@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ken
Date: Fri Mar 27 00:42:51 2015
New Revision: 280722
URL: https://svnweb.freebsd.org/changeset/base/280722

Log:
  MFC revision 280463
  
    ------------------------------------------------------------------------
    r280463 | ken | 2015-03-24 15:42:28 -0600 (Tue, 24 Mar 2015) | 5 lines
  
    Remove some #if 0'ed code that apparently confuses cscope.
  
    Requested by:	Peter Xu <xzpeter@gmail.com>
    MFC after:	3 days
  
    ------------------------------------------------------------------------
  
  Sponsored by:	Spectra Logic

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 Mar 27 00:37:41 2015	(r280721)
+++ stable/10/sys/cam/ctl/ctl.c	Fri Mar 27 00:42:51 2015	(r280722)
@@ -12154,9 +12154,6 @@ ctl_lun_reset(struct ctl_lun *lun, union
 	/*
 	 * Run through the OOA queue and abort each I/O.
 	 */
-#if 0
-	TAILQ_FOREACH((struct ctl_io_hdr *)xio, &lun->ooa_queue, ooa_links) {
-#endif
 	for (xio = (union ctl_io *)TAILQ_FIRST(&lun->ooa_queue); xio != NULL;
 	     xio = (union ctl_io *)TAILQ_NEXT(&xio->io_hdr, ooa_links)) {
 		xio->io_hdr.flags |= CTL_FLAG_ABORT | CTL_FLAG_ABORT_STATUS;
@@ -12337,9 +12334,6 @@ ctl_abort_task(union ctl_io *io)
 	 * untagged command to abort, simply abort the first untagged command
 	 * we come to.  We only allow one untagged command at a time of course.
 	 */
-#if 0
-	TAILQ_FOREACH((struct ctl_io_hdr *)xio, &lun->ooa_queue, ooa_links) {
-#endif
 	for (xio = (union ctl_io *)TAILQ_FIRST(&lun->ooa_queue); xio != NULL;
 	     xio = (union ctl_io *)TAILQ_NEXT(&xio->io_hdr, ooa_links)) {
 #if 0
@@ -12377,7 +12371,7 @@ ctl_abort_task(union ctl_io *io)
 #if 0
 		if (((xio->scsiio.tag_type == CTL_TAG_UNTAGGED)
 		  && (io->taskio.tag_type == CTL_TAG_UNTAGGED))
-		 || (xio->scsiio.tag_num == io->taskio.tag_num)) {
+		 || (xio->scsiio.tag_num == io->taskio.tag_num))
 #endif
 		/*
 		 * XXX KDM we've got problems with FC, because it

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503270042.t2R0gqFQ095836>