From owner-svn-src-projects@FreeBSD.ORG Mon Aug 26 16:32:56 2013 Return-Path: Delivered-To: svn-src-projects@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 ESMTP id 936CC166; Mon, 26 Aug 2013 16:32:56 +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 7FE252F7D; Mon, 26 Aug 2013 16:32:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7QGWuMK077927; Mon, 26 Aug 2013 16:32:56 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7QGWuUZ077926; Mon, 26 Aug 2013 16:32:56 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201308261632.r7QGWuUZ077926@svn.freebsd.org> From: Alexander Motin Date: Mon, 26 Aug 2013 16:32:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254916 - projects/camlock/sys/geom/stripe 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: Mon, 26 Aug 2013 16:32:56 -0000 Author: mav Date: Mon Aug 26 16:32:56 2013 New Revision: 254916 URL: http://svnweb.freebsd.org/changeset/base/254916 Log: In addition to r254914 switch from using g_std_done() to g_stripe_done(). It is required for direct dispatch because g_std_done() is unlocked. Modified: projects/camlock/sys/geom/stripe/g_stripe.c Modified: projects/camlock/sys/geom/stripe/g_stripe.c ============================================================================== --- projects/camlock/sys/geom/stripe/g_stripe.c Mon Aug 26 16:23:54 2013 (r254915) +++ projects/camlock/sys/geom/stripe/g_stripe.c Mon Aug 26 16:32:56 2013 (r254916) @@ -457,7 +457,7 @@ g_stripe_start_economic(struct bio *bp, /* * Fill in the component buf structure. */ - cbp->bio_done = g_std_done; + cbp->bio_done = g_stripe_done; cbp->bio_offset = offset; cbp->bio_data = addr; cbp->bio_length = length; @@ -482,7 +482,7 @@ g_stripe_start_economic(struct bio *bp, /* * Fill in the component buf structure. */ - cbp->bio_done = g_std_done; + cbp->bio_done = g_stripe_done; cbp->bio_offset = offset; cbp->bio_data = addr; /* @@ -539,15 +539,15 @@ g_stripe_flush(struct g_stripe_softc *sc return; } bioq_insert_tail(&queue, cbp); - cbp->bio_done = g_std_done; - cbp->bio_caller1 = sc->sc_disks[no]; + cbp->bio_done = g_stripe_done; + cbp->bio_caller2 = sc->sc_disks[no]; cbp->bio_to = sc->sc_disks[no]->provider; } for (cbp = bioq_first(&queue); cbp != NULL; cbp = bioq_first(&queue)) { bioq_remove(&queue, cbp); G_STRIPE_LOGREQ(cbp, "Sending request."); - cp = cbp->bio_caller1; - cbp->bio_caller1 = NULL; + cp = cbp->bio_caller2; + cbp->bio_caller2 = NULL; g_io_request(cbp, cp); } }