aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2014-11-24 00:59:51 +0000
committerAlexander Motin <mav@FreeBSD.org>2014-11-24 00:59:51 +0000
commit7c5db11fe05d0600d6c28a53442e4d296a37a43b (patch)
tree47a04925ba23a1615bd095f30264a9cf0f13c3a7 /sys
parente4fd57fb6696b7cd336cfa24429fcb1128bcdf37 (diff)
downloadsrc-7c5db11fe05d0600d6c28a53442e4d296a37a43b.tar.gz
src-7c5db11fe05d0600d6c28a53442e4d296a37a43b.zip
Read cs_outstanding_ctl_pdus before incrementing it for NEXUS RESET task.
This removes extra log noise on idle connection termination. MFC after: 1 week
Notes
Notes: svn path=/head/; revision=274940
Diffstat (limited to 'sys')
-rw-r--r--sys/cam/ctl/ctl_frontend_iscsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index fb0a51e4bd30..5e42a6e1b84b 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -1076,6 +1076,7 @@ cfiscsi_session_terminate_tasks(struct cfiscsi_session *cs)
io->io_hdr.nexus.targ_lun = 0;
io->taskio.tag_type = CTL_TAG_SIMPLE; /* XXX */
io->taskio.task_action = CTL_TASK_I_T_NEXUS_RESET;
+ wait = cs->cs_outstanding_ctl_pdus;
refcount_acquire(&cs->cs_outstanding_ctl_pdus);
error = ctl_queue(io);
if (error != CTL_RETVAL_COMPLETE) {
@@ -1103,7 +1104,6 @@ cfiscsi_session_terminate_tasks(struct cfiscsi_session *cs)
/*
* Wait for CTL to terminate all the tasks.
*/
- wait = cs->cs_outstanding_ctl_pdus;
if (wait > 0)
CFISCSI_SESSION_WARN(cs,
"waiting for CTL to terminate %d tasks", wait);