Module Name: src
Committed By: msaitoh
Date: Fri Apr 5 08:40:19 UTC 2019
Modified Files:
src/sys/dev [netbsd-8]: ccd.c dksubr.c
src/sys/dev/ofw [netbsd-8]: ofdisk.c
src/sys/kern [netbsd-8]: subr_disk.c
src/sys/sys [netbsd-8]: dkio.h
Log Message:
Pull up following revision(s) (requested by martin in ticket #1223):
sys/sys/dkio.h: revision 1.25
sys/kern/subr_disk.c: revision 1.123
sys/dev/dksubr.c: revision 1.107
sys/dev/ccd.c: revision 1.179
sys/dev/ofw/ofdisk.c: revision 1.53
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.172 -r1.172.2.1 src/sys/dev/ccd.c
cvs rdiff -u -r1.97.2.2 -r1.97.2.3 src/sys/dev/dksubr.c
cvs rdiff -u -r1.52 -r1.52.6.1 src/sys/dev/ofw/ofdisk.c
cvs rdiff -u -r1.119 -r1.119.2.1 src/sys/kern/subr_disk.c
cvs rdiff -u -r1.24 -r1.24.6.1 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.172 src/sys/dev/ccd.c:1.172.2.1
--- src/sys/dev/ccd.c:1.172 Thu Jun 1 02:45:08 2017
+++ src/sys/dev/ccd.c Fri Apr 5 08:40:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.172 2017/06/01 02:45:08 chs Exp $ */
+/* $NetBSD: ccd.c,v 1.172.2.1 2019/04/05 08:40:19 msaitoh 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.172 2017/06/01 02:45:08 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.172.2.1 2019/04/05 08:40:19 msaitoh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1160,6 +1160,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.97.2.2 src/sys/dev/dksubr.c:1.97.2.3
--- src/sys/dev/dksubr.c:1.97.2.2 Mon Nov 26 17:13:07 2018
+++ src/sys/dev/dksubr.c Fri Apr 5 08:40:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.97.2.2 2018/11/26 17:13:07 snj Exp $ */
+/* $NetBSD: dksubr.c,v 1.97.2.3 2019/04/05 08:40:19 msaitoh 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.97.2.2 2018/11/26 17:13:07 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.97.2.3 2019/04/05 08:40:19 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -616,6 +616,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.52.6.1
--- src/sys/dev/ofw/ofdisk.c:1.52 Sat Mar 25 09:21:21 2017
+++ src/sys/dev/ofw/ofdisk.c Fri Apr 5 08:40:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdisk.c,v 1.52 2017/03/25 09:21:21 martin Exp $ */
+/* $NetBSD: ofdisk.c,v 1.52.6.1 2019/04/05 08:40:19 msaitoh 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.52.6.1 2019/04/05 08:40:19 msaitoh 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.119 src/sys/kern/subr_disk.c:1.119.2.1
--- src/sys/kern/subr_disk.c:1.119 Thu Jun 1 02:45:13 2017
+++ src/sys/kern/subr_disk.c Fri Apr 5 08:40:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk.c,v 1.119 2017/06/01 02:45:13 chs Exp $ */
+/* $NetBSD: subr_disk.c,v 1.119.2.1 2019/04/05 08:40:19 msaitoh 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.119 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.119.2.1 2019/04/05 08:40:19 msaitoh 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.24.6.1
--- src/sys/sys/dkio.h:1.24 Wed Apr 5 20:15:49 2017
+++ src/sys/sys/dkio.h Fri Apr 5 08:40:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dkio.h,v 1.24 2017/04/05 20:15:49 jdolecek Exp $ */
+/* $NetBSD: dkio.h,v 1.24.6.1 2019/04/05 08:40:19 msaitoh 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_ */
