From owner-svn-src-projects@FreeBSD.ORG Tue Oct 15 21:02:03 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 07F3C62E; Tue, 15 Oct 2013 21:02:03 +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 E93582867; Tue, 15 Oct 2013 21:02:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FL226N098804; Tue, 15 Oct 2013 21:02:02 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FL22R4098803; Tue, 15 Oct 2013 21:02:02 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310152102.r9FL22R4098803@svn.freebsd.org> From: Alexander Motin Date: Tue, 15 Oct 2013 21:02:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256559 - 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: Tue, 15 Oct 2013 21:02:03 -0000 Author: mav Date: Tue Oct 15 21:02:02 2013 New Revision: 256559 URL: http://svnweb.freebsd.org/changeset/base/256559 Log: Assert proper lock in newly MFC'ed code. Modified: projects/camlock/sys/cam/cam_xpt.c Modified: projects/camlock/sys/cam/cam_xpt.c ============================================================================== --- projects/camlock/sys/cam/cam_xpt.c Tue Oct 15 21:00:30 2013 (r256558) +++ projects/camlock/sys/cam/cam_xpt.c Tue Oct 15 21:02:02 2013 (r256559) @@ -1071,7 +1071,7 @@ xpt_denounce_periph(struct cam_periph *p { struct cam_path *path = periph->path; - mtx_assert(periph->sim->mtx, MA_OWNED); + cam_periph_assert(periph, MA_OWNED); printf("%s%d at %s%d bus %d scbus%d target %d lun %d\n", periph->periph_name, periph->unit_number, path->bus->sim->sim_name,