From owner-cvs-all Mon Jan 28 18:50:59 2002 Delivered-To: cvs-all@freebsd.org Received: from wantadilla.lemis.com (wantadilla.lemis.com [192.109.197.80]) by hub.freebsd.org (Postfix) with ESMTP id 2DCE237B402; Mon, 28 Jan 2002 18:50:41 -0800 (PST) Received: by wantadilla.lemis.com (Postfix, from userid 1004) id 58CF678307; Tue, 29 Jan 2002 13:20:28 +1030 (CST) Date: Tue, 29 Jan 2002 13:20:28 +1030 From: Greg Lehey To: Dima Dorfman Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/dev/vinum vinumconfig.c Message-ID: <20020129132028.L37206@wantadilla.lemis.com> References: <200201290214.g0T2Epa08863@freefall.freebsd.org>; <20020129024220.1E0643E2F@bazooka.trit.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020129024220.1E0643E2F@bazooka.trit.org> User-Agent: Mutt/1.3.23i Organization: LEMIS, PO Box 460, Echunga SA 5153, Australia Phone: +61-8-8388-8286 Fax: +61-8-8388-8725 Mobile: +61-418-838-708 WWW-Home-Page: http://www.lemis.com/~grog X-PGP-Fingerprint: 6B 7B C3 8C 61 CD 54 AF 13 24 52 F8 6D A4 95 EF Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tuesday, 29 January 2002 at 2:42:15 +0000, Dima Dorfman wrote: > Greg Lehey wrote: >> grog 2002/01/28 18:14:51 PST >> >> Modified files: >> sys/dev/vinum vinumconfig.c >> Log: >> Forced commit. The previous commit log was garbled and didn't even >> apply to this file. The correct message is: >> >> throw_rude_remark: Make sure we're holding the config lock before >> proceeding. There's no reason to assume that this >> has ever happened, but the alternative might be a >> double fault. >> >> Revision Changes Path >> 1.45 +5 -0 src/sys/dev/vinum/vinumconfig.c > ^^^^^^^^^^ > Was this intentional? Of course. >> Index: src/sys/dev/vinum/vinumconfig.c >> diff -u src/sys/dev/vinum/vinumconfig.c:1.44 src/sys/dev/vinum/vinumconfig.c:1.45 >> --- src/sys/dev/vinum/vinumconfig.c:1.44 Sat Jan 26 20:20:52 2002 >> +++ src/sys/dev/vinum/vinumconfig.c Mon Jan 28 18:14:51 2002 >> @@ -99,8 +99,13 @@ >> static int finishing; /* don't recurse */ >> int was_finishing; >> >> +<<<<<<< vinumconfig.c >> + if ((vinum_conf.flags & VF_LOCKED) == 0) /* bug catcher */ >> + panic ("throw_rude_remark: called without config lock"); >> +======= >> if ((vinum_conf.flags & VF_LOCKED) == 0) /* bug catcher */ >> panic ("throw_rude_remark: called without config lock"); >> +>>>>>>> 1.44 >> va_start(ap, msg); >> if ((ioctl_reply != NULL) /* we're called from the user */ >> &&(!(vinum_conf.flags & VF_READING_CONFIG))) { /* and not reading from disk: return msg */ Grrr. How did that happen? /me wanders off, cursing and swearing. -- Finger grog@lemis.com for PGP public key See complete headers for address and phone numbers To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message