From owner-p4-projects@FreeBSD.ORG Fri May 25 14:48:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BDE016A468; Fri, 25 May 2007 14:48:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E678916A400 for ; Fri, 25 May 2007 14:48:16 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D4A4313C468 for ; Fri, 25 May 2007 14:48:16 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4PEmGvP021541 for ; Fri, 25 May 2007 14:48:16 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4PEmG6q021535 for perforce@freebsd.org; Fri, 25 May 2007 14:48:16 GMT (envelope-from lulf@FreeBSD.org) Date: Fri, 25 May 2007 14:48:16 GMT Message-Id: <200705251448.l4PEmG6q021535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 120385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 May 2007 14:48:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=120385 Change 120385 by lulf@lulf_carrot on 2007/05/25 14:48:02 - Make sure the lock is not held. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#8 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#8 (text+ko) ==== @@ -481,6 +481,8 @@ KASSERT(p != NULL, ("gv_issue_next_parity_bio: NULL p")); + /* Make sure we don't have the lock. */ + g_topology_assert_not(); g_topology_lock(); error = gv_access(p->vol_sc->provider, 1, 1, 0); if (error) { @@ -534,6 +536,8 @@ g_free(bp->bio_data); g_destroy_bio(bp); + /* Make sure we don't have the lock. */ + g_topology_assert_not(); g_topology_lock(); gv_access(p->vol_sc->provider, -1, -1, 0); g_topology_unlock();