Author: mav
Date: Fri Jul 4 16:07:57 2014
New Revision: 268258
URL: http://svnweb.freebsd.org/changeset/base/268258
Log:
MFC r267574 (by trasz):
Make cs_terminating a bool; no functional changes.
Modified:
stable/10/sys/cam/ctl/ctl_frontend_iscsi.c
stable/10/sys/cam/ctl/ctl_frontend_iscsi.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Fri Jul 4 16:06:56 2014
(r268257)
+++ stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Fri Jul 4 16:07:57 2014
(r268258)
@@ -1129,8 +1129,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
@@ -1150,9 +1148,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: stable/10/sys/cam/ctl/ctl_frontend_iscsi.h
==============================================================================
--- stable/10/sys/cam/ctl/ctl_frontend_iscsi.h Fri Jul 4 16:06:56 2014
(r268257)
+++ stable/10/sys/cam/ctl/ctl_frontend_iscsi.h Fri Jul 4 16:07:57 2014
(r268258)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
