d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make cs_terminating a bool; no functional changes.

Browse Source 
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Edward Tomasz Napierala 2014-06-17 09:02:10 +00:00
parent 51040796d0
commit 2af142cafe
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/cam/ctl/ctl_frontend_iscsi.c
View File

@ -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);

2
sys/cam/ctl/ctl_frontend_iscsi.h
View File

@ -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;