From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 12:15:34 2013 Return-Path: Delivered-To: svn-src-projects@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 ESMTP id 3E42E5E0; Wed, 16 Oct 2013 12:15:34 +0000 (UTC) (envelope-from mav@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2CB4E28D3; Wed, 16 Oct 2013 12:15:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GCFYDB094503; Wed, 16 Oct 2013 12:15:34 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GCFYpY094502; Wed, 16 Oct 2013 12:15:34 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310161215.r9GCFYpY094502@svn.freebsd.org> From: Alexander Motin Date: Wed, 16 Oct 2013 12:15:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256623 - projects/camlock/sys/cam X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 12:15:34 -0000 Author: mav Date: Wed Oct 16 12:15:33 2013 New Revision: 256623 URL: http://svnweb.freebsd.org/changeset/base/256623 Log: Oops, fix for r256622: put THREAD_NO_SLEEPING() into the better place. Modified: projects/camlock/sys/cam/cam_xpt.c Modified: projects/camlock/sys/cam/cam_xpt.c ============================================================================== --- projects/camlock/sys/cam/cam_xpt.c Wed Oct 16 12:13:20 2013 (r256622) +++ projects/camlock/sys/cam/cam_xpt.c Wed Oct 16 12:15:33 2013 (r256623) @@ -5265,7 +5265,6 @@ xpt_done_td(void *arg) STAILQ_HEAD(, ccb_hdr) doneq; STAILQ_INIT(&doneq); - THREAD_NO_SLEEPING(); mtx_lock(&queue->cam_doneq_mtx); while (1) { while (STAILQ_EMPTY(&queue->cam_doneq)) { @@ -5277,11 +5276,13 @@ xpt_done_td(void *arg) STAILQ_CONCAT(&doneq, &queue->cam_doneq); mtx_unlock(&queue->cam_doneq_mtx); + THREAD_NO_SLEEPING(); while ((ccb_h = STAILQ_FIRST(&doneq)) != NULL) { STAILQ_REMOVE_HEAD(&doneq, sim_links.stqe); ccb_h->pinfo.index = CAM_UNQUEUED_INDEX; xpt_done_process(ccb_h); } + THREAD_SLEEPING_OK(); mtx_lock(&queue->cam_doneq_mtx); }