Index: vinumext.h
===================================================================
RCS file: /home/dcvs/src/sys/dev/raid/vinum/vinumext.h,v
retrieving revision 1.12
diff -u -r1.12 vinumext.h
--- vinumext.h	7 Jun 2007 22:58:38 -0000	1.12
+++ vinumext.h	13 Jun 2007 18:19:31 -0000
@@ -184,7 +184,6 @@
 void update_plex_state(int plexno);
 void update_volume_state(int volno);
 void invalidate_subdisks(struct plex *, enum sdstate);
-int write_volume_label(int);
 void start_object(struct vinum_ioctl_msg *);
 void stop_object(struct vinum_ioctl_msg *);
 void setstate(struct vinum_ioctl_msg *msg);
Index: vinumioctl.c
===================================================================
RCS file: /home/dcvs/src/sys/dev/raid/vinum/vinumioctl.c,v
retrieving revision 1.9
diff -u -r1.9 vinumioctl.c
--- vinumioctl.c	7 Jun 2007 22:58:38 -0000	1.9
+++ vinumioctl.c	13 Jun 2007 20:56:26 -0000
@@ -234,11 +234,6 @@
 	    return vinum_rqinfo(data);
 #endif
 
-	case VINUM_LABEL:				    /* label a volume */
-	    ioctl_reply->error = write_volume_label(*(int *) data); /* index of the volume to label */
-	    ioctl_reply->msg[0] = '\0';			    /* no message */
-	    return 0;
-
 	case VINUM_REMOVE:
 	    remove((struct vinum_ioctl_msg *) data);	    /* remove an object */
 	    return 0;
@@ -308,6 +303,7 @@
 	    break;
 	}
 
+    case VINUM_LABEL:
     case VINUM_DRIVE_TYPE:
     case VINUM_SD_TYPE:
     case VINUM_RAWSD_TYPE: