summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorken <ken@FreeBSD.org>2015-03-27 00:42:51 +0000
committerken <ken@FreeBSD.org>2015-03-27 00:42:51 +0000
commit2052788664bd03a813f2a809f05dccd89cd251b3 (patch)
tree94e68dcee5232c8ffc25a04a5467171ef3f45101
parent159c9364d9bd6b7e517fb24e51ea68177e1a732c (diff)
downloadFreeBSD-src-2052788664bd03a813f2a809f05dccd89cd251b3.zip
FreeBSD-src-2052788664bd03a813f2a809f05dccd89cd251b3.tar.gz
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
-rw-r--r--sys/cam/ctl/ctl.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 39bc48f..bbc8b41 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -12154,9 +12154,6 @@ ctl_lun_reset(struct ctl_lun *lun, union ctl_io *io, ctl_ua_type ua_type)
/*
* 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
OpenPOWER on IntegriCloud