From owner-freebsd-stable@FreeBSD.ORG Thu Sep 7 01:04:00 2006 Return-Path: X-Original-To: freebsd-stable@freebsd.org Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4795D16A62C for ; Thu, 7 Sep 2006 01:04:00 +0000 (UTC) (envelope-from imb@protected-networks.net) Received: from aaron.protected-networks.net (aaron.protected-networks.net [202.12.127.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 53F3F43DD0 for ; Thu, 7 Sep 2006 01:03:50 +0000 (GMT) (envelope-from imb@protected-networks.net) Received: from localhost (localhost [127.0.0.1]) by aaron.protected-networks.net (Postfix) with ESMTP id 8960EC496; Wed, 6 Sep 2006 21:03:49 -0400 (EDT) Received: from aaron.protected-networks.net (localhost [127.0.0.1]) by aaron.protected-networks.net (Postfix) with ESMTP id 97170C449; Wed, 6 Sep 2006 21:03:36 -0400 (EDT) Authentication-Results: aaron.protected-networks.net from=imb@protected-networks.net; domainkey=pass Received: from aaron.protected-networks.net (localhost [127.0.0.1]) by aaron.protected-networks.net (Postfix) with ESMTP id 28F63C427; Wed, 6 Sep 2006 21:03:36 -0400 (EDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=200509; d=protected-networks.net; h=Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:X-Enigmail-Version:OpenPGP:Content-Type; b=ChTbdKj6quDm40cdcN0PopHGjM6yibGBqA+xZf3+o87HxQLABTt36PrZfRXgfyMgvQvESd/XZUlPUMAmmFh9M3+aXVeheKDMlUn5DhFm2FP9k6fkGQMTif4i/1MKv7UY; Received: from [192.168.1.10] (socker.hsd1.ma.comcast.net [24.218.145.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "Iain Michael Butler", Issuer "Protected Networks Certificate Authority" (verified OK)) (Authenticated sender: imb@protected-networks.net) by aaron.protected-networks.net (Postfix) with ESMTP id 74CD5C2E8; Wed, 6 Sep 2006 21:03:35 -0400 (EDT) Message-ID: <44FF6FE6.4080602@protected-networks.net> Date: Wed, 06 Sep 2006 21:03:34 -0400 From: Michael Butler User-Agent: Thunderbird 1.5.0.5 (X11/20060729) MIME-Version: 1.0 To: Volker References: <44FF4909.9020108@vwsoft.com> <44FF5B02.3090804@vwsoft.com> In-Reply-To: <44FF5B02.3090804@vwsoft.com> X-Enigmail-Version: 0.94.0.0 OpenPGP: id=0442D492 Content-Type: multipart/mixed; boundary="------------010702000506000506010009" Cc: freebsd-stable@freebsd.org Subject: Re: gmirror RAID-1: rebuilding freezes machine X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Sep 2006 01:04:00 -0000 This is a multi-part message in MIME format. --------------010702000506000506010009 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I'm backing out the attached change to see if it fixes it .. Michael -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQFE/2/mQv9rrgRC1JIRArNYAJsEuTtrmig9bdW4aDQQ8W1May+EfQCfUjDQ Xc1A9gUrrLS2jgbDP4xyC7I= =5DtW -----END PGP SIGNATURE----- --------------010702000506000506010009 Content-Type: text/plain; name="gmirror-1.66.2.7-1.66.2.8-patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="gmirror-1.66.2.7-1.66.2.8-patch" Index: src/sys/geom/mirror/g_mirror.c =================================================================== RCS file: /usr/home/ncvs/src/sys/geom/mirror/g_mirror.c,v retrieving revision 1.66.2.7 retrieving revision 1.66.2.8 diff -u -r1.66.2.7 -r1.66.2.8 --- src/sys/geom/mirror/g_mirror.c 16 Jul 2006 15:47:46 -0000 1.66.2.7 +++ src/sys/geom/mirror/g_mirror.c 4 Sep 2006 12:55:43 -0000 1.66.2.8 @@ -1813,12 +1813,19 @@ bioq_remove(&sc->sc_queue, bp); mtx_unlock(&sc->sc_queue_mtx); - if ((bp->bio_cflags & G_MIRROR_BIO_FLAG_REGULAR) != 0) - g_mirror_regular_request(bp); - else if ((bp->bio_cflags & G_MIRROR_BIO_FLAG_SYNC) != 0) - g_mirror_sync_request(bp); - else + if (bp->bio_to != sc->sc_provider) { + if ((bp->bio_cflags & G_MIRROR_BIO_FLAG_REGULAR) != 0) + g_mirror_regular_request(bp); + else if ((bp->bio_cflags & G_MIRROR_BIO_FLAG_SYNC) != 0) + g_mirror_sync_request(bp); + else { + KASSERT(0, + ("Invalid request cflags=0x%hhx to=%s.", + bp->bio_cflags, bp->bio_to->name)); + } + } else { g_mirror_register_request(bp); + } G_MIRROR_DEBUG(5, "%s: I'm here 9.", __func__); } } --------------010702000506000506010009--