summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorgrog <grog@FreeBSD.org>2002-01-29 02:49:15 +0000
committergrog <grog@FreeBSD.org>2002-01-29 02:49:15 +0000
commiteee67dc655a0093bc0f3affb1ff31995cb264458 (patch)
tree96d4e832d107fd97bf66de2202f13a397508c9a6 /sys
parent5754c3bd9ffa4d119059c314cf7b12ca88dd4865 (diff)
downloadFreeBSD-src-eee67dc655a0093bc0f3affb1ff31995cb264458.zip
FreeBSD-src-eee67dc655a0093bc0f3affb1ff31995cb264458.tar.gz
Grr. The last commit contained update conflicts. It just goes to
show that you should check the code even for a forced commit. Spotted by: dd
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/vinum/vinumconfig.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c
index ec890b0..e1d7d0e 100644
--- a/sys/dev/vinum/vinumconfig.c
+++ b/sys/dev/vinum/vinumconfig.c
@@ -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 */
OpenPOWER on IntegriCloud