Drop kernel support for the useless DIOCWLABEL ioctl and prune a lot

of silly flag twiddling code in various disk drivers.

ok deraadt@, miod@

N.B., users will need a -current disklabel(8) to be able to write new
disklabels to disk now.

5 files changed, 5 insertions, 31 deletions

diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 1b0940d218a..cd7e49e2df3 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.80 2010/11/18 21:13:19 miod Exp $	*/
+/*	$OpenBSD: fd.c,v 1.81 2011/06/05 18:40:33 matthew Exp $	*/
 /*	$NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $	*/
 
 /*-
@@ -1762,12 +1762,6 @@ fdioctl(dev, cmd, addr, flag, p)
 		    &fd->sc_dk.dk_label->d_partitions[FDPART(dev)];
 		return 0;
 
-	case DIOCWLABEL:
-		if ((flag & FWRITE) == 0)
-			return EBADF;
-		/* XXX do something */
-		return (0);
-
 	case DIOCWDINFO:
 	case DIOCSDINFO:
 		if ((flag & FWRITE) == 0)
diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c
index ad9402c735a..af721ed86e2 100644
--- a/sys/arch/sparc/dev/xd.c
+++ b/sys/arch/sparc/dev/xd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xd.c,v 1.54 2011/06/03 21:14:11 matthew Exp $	*/
+/*	$OpenBSD: xd.c,v 1.55 2011/06/05 18:40:33 matthew Exp $	*/
 /*	$NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $	*/
 
 /*
@@ -848,15 +848,6 @@ xdioctl(dev, command, addr, flag, p)
 		    &xd->sc_dk.dk_label->d_partitions[DISKPART(dev)];
 		return 0;
 
-	case DIOCWLABEL:	/* change write status of disk label */
-		if ((flag & FWRITE) == 0)
-			return EBADF;
-		if (*(int *) addr)
-			xd->flags |= XD_WLABEL;
-		else
-			xd->flags &= ~XD_WLABEL;
-		return 0;
-
 	case DIOCWDINFO:	/* write disk label */
 	case DIOCSDINFO:	/* set disk label */
 		if ((flag & FWRITE) == 0)
diff --git a/sys/arch/sparc/dev/xdvar.h b/sys/arch/sparc/dev/xdvar.h
index eb98bf58953..7322171b6f8 100644
--- a/sys/arch/sparc/dev/xdvar.h
+++ b/sys/arch/sparc/dev/xdvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xdvar.h,v 1.6 2004/09/29 07:35:11 miod Exp $	*/
+/*	$OpenBSD: xdvar.h,v 1.7 2011/06/05 18:40:33 matthew Exp $	*/
 /*	$NetBSD: xdvar.h,v 1.5 1996/03/31 22:38:56 pk Exp $	*/
 
 /*
@@ -120,7 +120,6 @@ struct xd_softc {
  * flags
  */
 
-#define XD_WLABEL 0x0001           /* write label */
 /*
  * state
  */
diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c
index 27192e24f46..071f98fc864 100644
--- a/sys/arch/sparc/dev/xy.c
+++ b/sys/arch/sparc/dev/xy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xy.c,v 1.51 2011/06/03 21:14:11 matthew Exp $	*/
+/*	$OpenBSD: xy.c,v 1.52 2011/06/05 18:40:33 matthew Exp $	*/
 /*	$NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $	*/
 
 /*
@@ -810,15 +810,6 @@ xyioctl(dev, command, addr, flag, p)
 		    &xy->sc_dk.dk_label->d_partitions[DISKPART(dev)];
 		return 0;
 
-	case DIOCWLABEL:	/* change write status of disk label */
-		if ((flag & FWRITE) == 0)
-			return EBADF;
-		if (*(int *) addr)
-			xy->flags |= XY_WLABEL;
-		else
-			xy->flags &= ~XY_WLABEL;
-		return 0;
-
 	case DIOCWDINFO:	/* write disk label */
 	case DIOCSDINFO:	/* set disk label */
 		if ((flag & FWRITE) == 0)
diff --git a/sys/arch/sparc/dev/xyvar.h b/sys/arch/sparc/dev/xyvar.h
index eec8eb23c8e..90e1d5a6d7b 100644
--- a/sys/arch/sparc/dev/xyvar.h
+++ b/sys/arch/sparc/dev/xyvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xyvar.h,v 1.6 2004/09/29 07:35:12 miod Exp $	*/
+/*	$OpenBSD: xyvar.h,v 1.7 2011/06/05 18:40:33 matthew Exp $	*/
 /*	$NetBSD: xyvar.h,v 1.4 1996/03/31 22:39:04 pk Exp $	*/
 
 /*
@@ -123,7 +123,6 @@ struct xy_softc {
  * flags
  */
 
-#define XY_WLABEL 0x0001           /* write label */
 /*
  * state
  */