Module Name: src
Committed By: martin
Date: Wed Mar 27 19:13:34 UTC 2019
Modified Files:
src/sys/dev: ccd.c dksubr.c
src/sys/dev/ofw: ofdisk.c
src/sys/kern: subr_disk.c
src/sys/sys: dkio.h
Log Message:
Add a disk ioctl DIOCRMWEDGES to remove all wedges of a given disk
(if not busy).
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/sys/dev/ccd.c
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/dksubr.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/ofw/ofdisk.c
cvs rdiff -u -r1.122 -r1.123 src/sys/kern/subr_disk.c
cvs rdiff -u -r1.24 -r1.25 src/sys/sys/dkio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.178 src/sys/dev/ccd.c:1.179
--- src/sys/dev/ccd.c:1.178 Fri Mar 1 11:06:56 2019
+++ src/sys/dev/ccd.c Wed Mar 27 19:13:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.178 2019/03/01 11:06:56 pgoyette Exp $ */
+/* $NetBSD: ccd.c,v 1.179 2019/03/27 19:13:34 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.178 2019/03/01 11:06:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.179 2019/03/27 19:13:34 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1126,6 +1126,7 @@ ccdioctl(dev_t dev, u_long cmd, void *da
case DIOCCACHESYNC:
case DIOCAWEDGE:
case DIOCDWEDGE:
+ case DIOCRMWEDGES:
case DIOCMWEDGES:
#ifdef __HAVE_OLD_DISKLABEL
case ODIOCSDINFO:
Index: src/sys/dev/dksubr.c
diff -u src/sys/dev/dksubr.c:1.106 src/sys/dev/dksubr.c:1.107
--- src/sys/dev/dksubr.c:1.106 Mon Jan 7 22:35:55 2019
+++ src/sys/dev/dksubr.c Wed Mar 27 19:13:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.106 2019/01/07 22:35:55 jdolecek Exp $ */
+/* $NetBSD: dksubr.c,v 1.107 2019/03/27 19:13:34 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.106 2019/01/07 22:35:55 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.107 2019/03/27 19:13:34 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -617,6 +617,7 @@ dk_ioctl(struct dk_softc *dksc, dev_t de
case DIOCDWEDGE:
case DIOCLWEDGES:
case DIOCMWEDGES:
+ case DIOCRMWEDGES:
case DIOCCACHESYNC:
#ifdef __HAVE_OLD_DISKLABEL
case ODIOCGDINFO:
Index: src/sys/dev/ofw/ofdisk.c
diff -u src/sys/dev/ofw/ofdisk.c:1.52 src/sys/dev/ofw/ofdisk.c:1.53
--- src/sys/dev/ofw/ofdisk.c:1.52 Sat Mar 25 09:21:21 2017
+++ src/sys/dev/ofw/ofdisk.c Wed Mar 27 19:13:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdisk.c,v 1.52 2017/03/25 09:21:21 martin Exp $ */
+/* $NetBSD: ofdisk.c,v 1.53 2019/03/27 19:13:34 martin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.52 2017/03/25 09:21:21 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.53 2019/03/27 19:13:34 martin Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -367,6 +367,7 @@ ofdisk_ioctl(dev_t dev, u_long cmd, void
case DIOCDWEDGE:
case DIOCAWEDGE:
case DIOCLWEDGES:
+ case DIOCRMWEDGES:
case DIOCMWEDGES:
if (OFDISK_FLOPPY_P(of))
return ENOTTY;
Index: src/sys/kern/subr_disk.c
diff -u src/sys/kern/subr_disk.c:1.122 src/sys/kern/subr_disk.c:1.123
--- src/sys/kern/subr_disk.c:1.122 Wed Mar 7 21:13:24 2018
+++ src/sys/kern/subr_disk.c Wed Mar 27 19:13:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk.c,v 1.122 2018/03/07 21:13:24 kre Exp $ */
+/* $NetBSD: subr_disk.c,v 1.123 2019/03/27 19:13:33 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2000, 2009 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.122 2018/03/07 21:13:24 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.123 2019/03/27 19:13:33 martin Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -645,6 +645,13 @@ disk_ioctl(struct disk *dk, dev_t dev, u
dkwedge_discover(dk);
return 0;
+ case DIOCRMWEDGES:
+ if ((flag & FWRITE) == 0)
+ return EBADF;
+
+ dkwedge_delall(dk);
+ return 0;
+
default:
return EPASSTHROUGH;
}
Index: src/sys/sys/dkio.h
diff -u src/sys/sys/dkio.h:1.24 src/sys/sys/dkio.h:1.25
--- src/sys/sys/dkio.h:1.24 Wed Apr 5 20:15:49 2017
+++ src/sys/sys/dkio.h Wed Mar 27 19:13:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dkio.h,v 1.24 2017/04/05 20:15:49 jdolecek Exp $ */
+/* $NetBSD: dkio.h,v 1.25 2019/03/27 19:13:33 martin Exp $ */
/*
* Copyright (c) 1987, 1988, 1993
@@ -130,4 +130,7 @@
#define DIOCGSECTORSIZE _IOR('d', 133, u_int) /* sector size in bytes */
#define DIOCGMEDIASIZE _IOR('d', 132, off_t) /* media size in bytes */
+ /* mass removal */
+#define DIOCRMWEDGES _IOR('d', 134, int) /* remove all wedges */
+
#endif /* _SYS_DKIO_H_ */
