From 885fbc97c14fbb5b5bdbbffe2f625b05ed9f0886 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 24 May 2002 06:01:07 +0000
Subject: [PATCH] Fix new compiler unhappiness.

---
 sys/dev/vinum/vinumconfig.c | 2 +-
 sys/dev/vinum/vinumioctl.c  | 1 +
 sys/dev/vinum/vinumrevive.c | 1 +
 sys/dev/vinum/vinumstate.c  | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c
index c3b9fd533f9..d40c6244186 100644
--- a/sys/dev/vinum/vinumconfig.c
+++ b/sys/dev/vinum/vinumconfig.c
@@ -1874,7 +1874,7 @@ update_plex_config(int plexno, int diskconfig)
     int required_sds;					    /* number of subdisks we need */
     struct sd *sd;
     struct volume *vol;
-    int data_sds;					    /* number of sds carrying data */
+    int data_sds = 0;					    /* number of sds carrying data */
 
     if (plex->state < plex_init)			    /* not a real plex, */
 	return;
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c
index 0e5f696ffa1..3eaab40dbc5 100644
--- a/sys/dev/vinum/vinumioctl.c
+++ b/sys/dev/vinum/vinumioctl.c
@@ -310,6 +310,7 @@ vinumioctl(dev_t dev,
 
 	default:
 	    /* FALLTHROUGH */
+	    break;
 	}
 
     case VINUM_DRIVE_TYPE:
diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c
index 1e368dbed95..16b878a7a22 100644
--- a/sys/dev/vinum/vinumrevive.c
+++ b/sys/dev/vinum/vinumrevive.c
@@ -131,6 +131,7 @@ revive_block(int sdno)
 	break;
 
     case plex_disorg:					    /* to keep the compiler happy */
+	break;
     }
 
     if (paritysd) {					    /* we're reviving a parity block, */
diff --git a/sys/dev/vinum/vinumstate.c b/sys/dev/vinum/vinumstate.c
index 2ad2706928c..e759a6b57ee 100644
--- a/sys/dev/vinum/vinumstate.c
+++ b/sys/dev/vinum/vinumstate.c
@@ -1085,6 +1085,7 @@ setstate_by_force(struct vinum_ioctl_msg *msg)
 	break;
 
     default:
+	break;
     }
     ioctl_reply->error = 0;
 }