d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Grr. The last commit contained update conflicts. It just goes to

Browse Source 
show that you should check the code even for a forced commit.

Spotted by:	dd
This commit is contained in:
grog 2002-01-29 02:49:15 +00:00
parent f4364e44d0
commit 7c5dc571f8
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,13 +99,8 @@ 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 */