From owner-svn-src-head@FreeBSD.ORG Tue Jun 17 09:02:11 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3BEEC5D8; Tue, 17 Jun 2014 09:02:11 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 291DC2648; Tue, 17 Jun 2014 09:02:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5H92Aut058018; Tue, 17 Jun 2014 09:02:10 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5H92AMm058016; Tue, 17 Jun 2014 09:02:10 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201406170902.s5H92AMm058016@svn.freebsd.org> From: Edward Tomasz Napierala Date: Tue, 17 Jun 2014 09:02:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267574 - 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.18 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: Tue, 17 Jun 2014 09:02:11 -0000 Author: trasz Date: Tue Jun 17 09:02:10 2014 New Revision: 267574 URL: http://svnweb.freebsd.org/changeset/base/267574 Log: Make cs_terminating a bool; no functional changes. Sponsored by: The FreeBSD Foundation Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c head/sys/cam/ctl/ctl_frontend_iscsi.h Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.c Tue Jun 17 08:56:16 2014 (r267573) +++ head/sys/cam/ctl/ctl_frontend_iscsi.c Tue Jun 17 09:02:10 2014 (r267574) @@ -1130,8 +1130,6 @@ cfiscsi_maintenance_thread(void *arg) icl_conn_shutdown(cs->cs_conn); icl_conn_close(cs->cs_conn); - cs->cs_terminating++; - /* * XXX: We used to wait up to 30 seconds to deliver queued PDUs * to the initiator. We also tried hard to deliver SCSI Responses @@ -1151,9 +1149,9 @@ static void cfiscsi_session_terminate(struct cfiscsi_session *cs) { - if (cs->cs_terminating != 0) + if (cs->cs_terminating) return; - cs->cs_terminating = 1; + cs->cs_terminating = true; cv_signal(&cs->cs_maintenance_cv); #ifdef ICL_KERNEL_PROXY cv_signal(&cs->cs_login_cv); Modified: head/sys/cam/ctl/ctl_frontend_iscsi.h ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.h Tue Jun 17 08:56:16 2014 (r267573) +++ head/sys/cam/ctl/ctl_frontend_iscsi.h Tue Jun 17 09:02:10 2014 (r267574) @@ -72,7 +72,7 @@ struct cfiscsi_session { int cs_timeout; int cs_portal_group_tag; struct cv cs_maintenance_cv; - int cs_terminating; + bool cs_terminating; size_t cs_max_data_segment_length; size_t cs_max_burst_length; bool cs_immediate_data;