system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-18 22:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forced commit. The previous commit log was garbled and didn't even

Browse source 
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.
This commit is contained in:
Greg Lehey 2002-01-29 02:14:51 +00:00
parent 60eda641fb
commit 60fc37994f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=89939
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/dev/vinum/vinumconfig.c
View file

@ -99,8 +99,13 @@ throw_rude_remark(int error, char *msg,...)
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 */