From owner-svn-src-head@FreeBSD.ORG Wed Oct 9 17:34:46 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7BE93F9A; Wed, 9 Oct 2013 17:34:46 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 513D72835; Wed, 9 Oct 2013 17:34:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99HYknE016560; Wed, 9 Oct 2013 17:34:46 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99HYkML016559; Wed, 9 Oct 2013 17:34:46 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201310091734.r99HYkML016559@svn.freebsd.org> From: Edward Tomasz Napierala Date: Wed, 9 Oct 2013 17:34:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r256201 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 17:34:46 -0000 Author: trasz Date: Wed Oct 9 17:34:45 2013 New Revision: 256201 URL: http://svnweb.freebsd.org/changeset/base/256201 Log: Remove no longer useful debugging output and a stale comment. Approved by: re (gjb) Sponsored by: FreeBSD Foundation Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.c Wed Oct 9 17:32:52 2013 (r256200) +++ head/sys/cam/ctl/ctl_frontend_iscsi.c Wed Oct 9 17:34:45 2013 (r256201) @@ -229,8 +229,6 @@ cfiscsi_pdu_update_cmdsn(const struct ic /* * The target MUST silently ignore any non-immediate command outside * of this range. - * - * XXX: ... or non-immediate duplicates within the range. */ if (cmdsn < cs->cs_cmdsn || cmdsn > cs->cs_cmdsn + maxcmdsn_delta) { CFISCSI_SESSION_UNLOCK(cs); @@ -720,10 +718,6 @@ cfiscsi_handle_data_segment(struct icl_p ctl_sglist->len = io->scsiio.kern_data_len; ctl_sg_count = 1; } -#if 0 - if (ctl_sg_count > 1) - CFISCSI_SESSION_DEBUG(cs, "ctl_sg_count = %d", ctl_sg_count); -#endif if ((request->ip_bhs->bhs_opcode & ~ISCSI_BHS_OPCODE_IMMEDIATE) == ISCSI_BHS_OPCODE_SCSI_DATA_OUT) @@ -2340,11 +2334,6 @@ cfiscsi_datamove_in(union ctl_io *io) */ PDU_TOTAL_TRANSFER_LEN(request) = io->scsiio.kern_total_len; -#if 0 - if (ctl_sg_count > 1) - CFISCSI_SESSION_DEBUG(cs, "ctl_sg_count = %d", ctl_sg_count); -#endif - /* * This is the offset within the current SCSI command; * i.e. for the first call of datamove(), it will be 0, @@ -2352,8 +2341,6 @@ cfiscsi_datamove_in(union ctl_io *io) * of previous ones. */ off = htonl(io->scsiio.kern_rel_offset); - if (off > 1) - CFISCSI_SESSION_DEBUG(cs, "off = %zd", off); i = 0; addr = NULL; @@ -2445,10 +2432,12 @@ cfiscsi_datamove_in(union ctl_io *io) if (response != NULL) { if (off == io->scsiio.kern_total_len) { bhsdi->bhsdi_flags |= BHSDI_FLAGS_F; +#if 0 } else { CFISCSI_SESSION_DEBUG(cs, "not setting the F flag; " "have %zd, need %zd", off, (size_t)io->scsiio.kern_total_len); +#endif } KASSERT(response->ip_data_len > 0, ("sending empty Data-In")); cfiscsi_pdu_queue(response);