Date: Tue, 29 Jan 2002 13:20:28 +1030 From: Greg Lehey <grog@lemis.com> To: Dima Dorfman <dima@trit.org> 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> In-Reply-To: <20020129024220.1E0643E2F@bazooka.trit.org> References: <200201290214.g0T2Epa08863@freefall.freebsd.org>; <20020129024220.1E0643E2F@bazooka.trit.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tuesday, 29 January 2002 at 2:42:15 +0000, Dima Dorfman wrote:
> Greg Lehey <grog@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020129132028.L37206>