From owner-svn-src-all@FreeBSD.ORG Thu Apr 17 12:41:12 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 9BDB65AB; Thu, 17 Apr 2014 12:41:12 +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 87C901739; Thu, 17 Apr 2014 12:41:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3HCfC7O033210; Thu, 17 Apr 2014 12:41:12 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3HCfCYJ033209; Thu, 17 Apr 2014 12:41:12 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201404171241.s3HCfCYJ033209@svn.freebsd.org> From: Edward Tomasz Napierala Date: Thu, 17 Apr 2014 12:41:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r264602 - stable/10/sys/cam/ctl X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2014 12:41:12 -0000 Author: trasz Date: Thu Apr 17 12:41:12 2014 New Revision: 264602 URL: http://svnweb.freebsd.org/changeset/base/264602 Log: MFC r262837: Make reset handling in iSCSI target RFC-compliant. This fixes some rare hangs with Open-iSCSI (Linux). Sponsored by: The FreeBSD Foundation Modified: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c 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 Thu Apr 17 12:33:26 2014 (r264601) +++ stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Thu Apr 17 12:41:12 2014 (r264602) @@ -633,11 +633,11 @@ cfiscsi_pdu_handle_task_request(struct i #endif io->taskio.task_action = CTL_TASK_LUN_RESET; break; - case BHSTMR_FUNCTION_TARGET_COLD_RESET: + case BHSTMR_FUNCTION_TARGET_WARM_RESET: #if 0 - CFISCSI_SESSION_DEBUG(cs, "BHSTMR_FUNCTION_TARGET_COLD_RESET"); + CFISCSI_SESSION_DEBUG(cs, "BHSTMR_FUNCTION_TARGET_WARM_RESET"); #endif - io->taskio.task_action = CTL_TASK_BUS_RESET; + io->taskio.task_action = CTL_TASK_TARGET_RESET; break; default: CFISCSI_SESSION_DEBUG(cs, "unsupported function 0x%x",