From 14d0b39e73a7064a0afc706e5514e6c0698fb91c Mon Sep 17 00:00:00 2001
From: Greg Lehey <grog@FreeBSD.org>
Date: Thu, 11 May 2000 07:22:18 +0000
Subject: [PATCH] Change linkage to parity maintenance operations.

---
 sys/dev/vinum/vinumext.h   |  6 +++---
 sys/dev/vinum/vinumioctl.c | 10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h
index 6518b9077e09..0ba7719f916e 100644
--- a/sys/dev/vinum/vinumext.h
+++ b/sys/dev/vinum/vinumext.h
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumext.h,v 1.22 1999/12/30 07:03:37 grog Exp grog $
+ * $Id: vinumext.h,v 1.25 2000/05/10 06:08:43 grog Exp grog $
  * $FreeBSD$
  */
 
@@ -190,13 +190,13 @@ void setstate_by_force(struct vinum_ioctl_msg *msg);
 void vinum_label(int);
 int vinum_writedisklabel(struct volume *, struct disklabel *);
 int initsd(int, int);
-struct buf *parityrebuild(struct plex *, u_int64_t, int, int, struct rangelock **);
+struct buf *parityrebuild(struct plex *, u_int64_t, int, enum parityop, struct rangelock **, off_t *);
 enum requeststatus sddownstate(struct request *rq);
 
 int restart_plex(int plexno);
 int revive_read(struct sd *sd);
 int revive_block(int sdno);
-void parityops(struct vinum_ioctl_msg *, enum parityop op);
+void parityops(struct vinum_ioctl_msg *);
 
 /* Auxiliary functions */
 enum sdstates sdstatemap(struct plex *plex);
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c
index c4400de65622..28e58ead6d16 100644
--- a/sys/dev/vinum/vinumioctl.c
+++ b/sys/dev/vinum/vinumioctl.c
@@ -41,7 +41,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumioctl.c,v 1.11 1999/10/13 02:19:25 grog Exp grog $
+ * $Id: vinumioctl.c,v 1.13 2000/04/26 04:10:20 grog Exp grog $
  * $FreeBSD$
  */
 
@@ -302,12 +302,8 @@ vinumioctl(dev_t dev,
 	    *(int *) data = daemon_options;
 	    return 0;
 
-	case VINUM_CHECKPARITY:				    /* check RAID-4/5 parity */
-	    parityops((struct vinum_ioctl_msg *) data, checkparity);
-	    return 0;
-
-	case VINUM_REBUILDPARITY:			    /* rebuild RAID-4/5 parity */
-	    parityops((struct vinum_ioctl_msg *) data, rebuildparity);
+	case VINUM_PARITYOP:				    /* check/rebuild RAID-4/5 parity */
+	    parityops((struct vinum_ioctl_msg *) data);
 	    return 0;
 
 	    /* move an object */