diff options
| author | grog <grog@FreeBSD.org> | 2002-01-29 02:14:51 +0000 |
|---|---|---|
| committer | grog <grog@FreeBSD.org> | 2002-01-29 02:14:51 +0000 |
| commit | 9e2d32bb6b6057972de20f2d595e4b219d0d2c46 (patch) | |
| tree | 99aa48700cf184ef191da58806d6590b5d54ed92 /sys | |
| parent | 6610d15f16a60a2d87c66029c5f5e2d27ac8e4a9 (diff) | |
| download | FreeBSD-src-9e2d32bb6b6057972de20f2d595e4b219d0d2c46.zip FreeBSD-src-9e2d32bb6b6057972de20f2d595e4b219d0d2c46.tar.gz | |
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.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/vinum/vinumconfig.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c index e1d7d0e..ec890b0 100644 --- a/sys/dev/vinum/vinumconfig.c +++ b/sys/dev/vinum/vinumconfig.c @@ -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 */ |
