summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authordholland <dholland@NetBSD.org>2014-07-25 08:02:18 +0000
committerdholland <dholland@NetBSD.org>2014-07-25 08:02:18 +0000
commitda8feef99a1863b3cdff350f8a1a089d34d09185 (patch)
tree1c6c71186b1e535a1dc636a9188051e98bdd8561 /sys/dev
parent1be6681b34110f97e344843acf115f2eaf591a2b (diff)
Add d_discard to all struct bdevsw instances I could find.
I've set them all to nodiscard. Some of them (wd, dk, vnd, ld, raidframe, maybe cgd) should be implemented for real.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/altmem/altmem.c5
-rw-r--r--sys/dev/ata/wd.c5
-rw-r--r--sys/dev/ccd.c5
-rw-r--r--sys/dev/cgd.c5
-rw-r--r--sys/dev/dkwedge/dk.c5
-rw-r--r--sys/dev/dm/device-mapper.c3
-rw-r--r--sys/dev/flash/flash.c5
-rw-r--r--sys/dev/fss.c8
-rw-r--r--sys/dev/gpib/ct.c5
-rw-r--r--sys/dev/gpib/mt.c5
-rw-r--r--sys/dev/gpib/rd.c5
-rw-r--r--sys/dev/ieee1394/fwdev.c5
-rw-r--r--sys/dev/isa/fd.c5
-rw-r--r--sys/dev/isa/mcd.c5
-rw-r--r--sys/dev/isa/wt.c5
-rw-r--r--sys/dev/ld.c5
-rw-r--r--sys/dev/mca/ed_mca.c5
-rw-r--r--sys/dev/md.c5
-rw-r--r--sys/dev/mscp/mscp_disk.c7
-rw-r--r--sys/dev/mscp/mscp_tape.c5
-rw-r--r--sys/dev/ofw/ofdisk.c5
-rw-r--r--sys/dev/qbus/rf.c5
-rw-r--r--sys/dev/qbus/rl.c5
-rw-r--r--sys/dev/qbus/ts.c5
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c5
-rw-r--r--sys/dev/scsipi/cd.c5
-rw-r--r--sys/dev/scsipi/sd.c5
-rw-r--r--sys/dev/scsipi/st.c5
-rw-r--r--sys/dev/spi/spiflash.c5
-rw-r--r--sys/dev/vme/xd.c5
-rw-r--r--sys/dev/vme/xy.c5
-rw-r--r--sys/dev/vnd.c5
32 files changed, 99 insertions, 64 deletions
diff --git a/sys/dev/altmem/altmem.c b/sys/dev/altmem/altmem.c
index 7b47b38ecf8..360c4fa0e2d 100644
--- a/sys/dev/altmem/altmem.c
+++ b/sys/dev/altmem/altmem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: altmem.c,v 1.2 2014/03/16 05:20:26 dholland Exp $ */
+/* $NetBSD: altmem.c,v 1.3 2014/07/25 08:02:19 dholland Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altmem.c,v 1.2 2014/03/16 05:20:26 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altmem.c,v 1.3 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/types.h>
#include <sys/device.h>
@@ -66,6 +66,7 @@ const struct bdevsw altmem_bdevsw = {
.d_ioctl = altmemioctl,
.d_dump = nodump,
.d_psize = altmemsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
const struct cdevsw altmem_cdevsw = {
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 5ba24f24393..560d4dcdd04 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.407 2014/03/16 05:20:27 dholland Exp $ */
+/* $NetBSD: wd.c,v 1.408 2014/07/25 08:02:19 dholland Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.407 2014/03/16 05:20:27 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.408 2014/07/25 08:02:19 dholland Exp $");
#include "opt_ata.h"
@@ -148,6 +148,7 @@ const struct bdevsw wd_bdevsw = {
.d_ioctl = wdioctl,
.d_dump = wddump,
.d_psize = wdsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index f17a3b2fc99..0943955fd02 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.149 2014/06/14 07:39:00 hannken Exp $ */
+/* $NetBSD: ccd.c,v 1.150 2014/07/25 08:02:19 dholland 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.149 2014/06/14 07:39:00 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.150 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -187,6 +187,7 @@ const struct bdevsw ccd_bdevsw = {
.d_ioctl = ccdioctl,
.d_dump = nodump,
.d_psize = ccdsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK | D_MPSAFE
};
diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c
index 00dc83e7850..0cfeedd4909 100644
--- a/sys/dev/cgd.c
+++ b/sys/dev/cgd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.88 2014/06/14 07:39:00 hannken Exp $ */
+/* $NetBSD: cgd.c,v 1.89 2014/07/25 08:02:19 dholland Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.88 2014/06/14 07:39:00 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.89 2014/07/25 08:02:19 dholland Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -77,6 +77,7 @@ const struct bdevsw cgd_bdevsw = {
.d_ioctl = cgdioctl,
.d_dump = cgddump,
.d_psize = cgdsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/dkwedge/dk.c b/sys/dev/dkwedge/dk.c
index c04d0b89d82..d2f9825401a 100644
--- a/sys/dev/dkwedge/dk.c
+++ b/sys/dev/dkwedge/dk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.69 2014/04/03 15:24:20 christos Exp $ */
+/* $NetBSD: dk.c,v 1.70 2014/07/25 08:02:19 dholland Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.69 2014/04/03 15:24:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.70 2014/07/25 08:02:19 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_dkwedge.h"
@@ -116,6 +116,7 @@ const struct bdevsw dk_bdevsw = {
.d_ioctl = dkioctl,
.d_dump = dkdump,
.d_psize = dksize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/dm/device-mapper.c b/sys/dev/dm/device-mapper.c
index 7165b04abe2..47eb9a42e77 100644
--- a/sys/dev/dm/device-mapper.c
+++ b/sys/dev/dm/device-mapper.c
@@ -1,4 +1,4 @@
-/* $NetBSD: device-mapper.c,v 1.32 2013/12/28 19:25:07 pgoyette Exp $ */
+/* $NetBSD: device-mapper.c,v 1.33 2014/07/25 08:02:19 dholland Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -84,6 +84,7 @@ const struct bdevsw dm_bdevsw = {
.d_ioctl = dmioctl,
.d_dump = nodump,
.d_psize = dmsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK | D_MPSAFE
};
diff --git a/sys/dev/flash/flash.c b/sys/dev/flash/flash.c
index 312039bee9d..57e4515acec 100644
--- a/sys/dev/flash/flash.c
+++ b/sys/dev/flash/flash.c
@@ -1,4 +1,4 @@
-/* $NetBSD: flash.c,v 1.10 2013/09/13 22:18:42 joerg Exp $ */
+/* $NetBSD: flash.c,v 1.11 2014/07/25 08:02:19 dholland Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.10 2013/09/13 22:18:42 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.11 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -98,6 +98,7 @@ const struct bdevsw flash_bdevsw = {
.d_ioctl = flashioctl,
.d_dump = flashdump,
.d_psize = nosize,
+ .d_discard = nodiscard, /* XXX this driver probably wants a discard */
.d_flag = D_DISK | D_MPSAFE
};
diff --git a/sys/dev/fss.c b/sys/dev/fss.c
index e8b82a69d21..d19bbadc782 100644
--- a/sys/dev/fss.c
+++ b/sys/dev/fss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.89 2014/05/25 13:52:12 hannken Exp $ */
+/* $NetBSD: fss.c,v 1.90 2014/07/25 08:02:19 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.89 2014/05/25 13:52:12 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.90 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -101,9 +101,11 @@ static struct vfs_hooks fss_vfs_hooks = {
const struct bdevsw fss_bdevsw = {
.d_open = fss_open,
.d_close = fss_close,
- .d_strategy = fss_strategy, fss_ioctl,
+ .d_strategy = fss_strategy,
+ .d_ioctl = fss_ioctl,
.d_dump = fss_dump,
.d_psize = fss_size,
+ .d_discard = nodiscard,
.d_flag = D_DISK | D_MPSAFE
};
diff --git a/sys/dev/gpib/ct.c b/sys/dev/gpib/ct.c
index 5b998082938..57aa53d77f2 100644
--- a/sys/dev/gpib/ct.c
+++ b/sys/dev/gpib/ct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ct.c,v 1.25 2014/03/16 05:20:27 dholland Exp $ */
+/* $NetBSD: ct.c,v 1.26 2014/07/25 08:02:19 dholland Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.25 2014/03/16 05:20:27 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.26 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -187,6 +187,7 @@ const struct bdevsw ct_bdevsw = {
.d_ioctl = ctioctl,
.d_dump = nodump,
.d_psize = nosize,
+ .d_discard = nodiscard,
.d_flag = D_TAPE
};
diff --git a/sys/dev/gpib/mt.c b/sys/dev/gpib/mt.c
index 6037b90a834..dec688d5307 100644
--- a/sys/dev/gpib/mt.c
+++ b/sys/dev/gpib/mt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mt.c,v 1.27 2014/03/23 02:57:20 christos Exp $ */
+/* $NetBSD: mt.c,v 1.28 2014/07/25 08:02:19 dholland Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.27 2014/03/23 02:57:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.28 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -167,6 +167,7 @@ const struct bdevsw mt_bdevsw = {
.d_ioctl = mtioctl,
.d_dump = nodump,
.d_psize = nosize,
+ .d_discard = nodiscard,
.d_flag = D_TAPE
};
diff --git a/sys/dev/gpib/rd.c b/sys/dev/gpib/rd.c
index 9e72720c56e..0e0eed51a9f 100644
--- a/sys/dev/gpib/rd.c
+++ b/sys/dev/gpib/rd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.33 2014/03/23 03:41:10 christos Exp $ */
+/* $NetBSD: rd.c,v 1.34 2014/07/25 08:02:19 dholland Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.33 2014/03/23 03:41:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.34 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -261,6 +261,7 @@ const struct bdevsw rd_bdevsw = {
.d_ioctl = rdioctl,
.d_dump = rddump,
.d_psize = rdsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/ieee1394/fwdev.c b/sys/dev/ieee1394/fwdev.c
index 9129b09af5f..114c81d3d8b 100644
--- a/sys/dev/ieee1394/fwdev.c
+++ b/sys/dev/ieee1394/fwdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwdev.c,v 1.28 2014/03/16 05:20:28 dholland Exp $ */
+/* $NetBSD: fwdev.c,v 1.29 2014/07/25 08:02:19 dholland Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwdev.c,v 1.28 2014/03/16 05:20:28 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwdev.c,v 1.29 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -78,6 +78,7 @@ const struct bdevsw fw_bdevsw = {
.d_ioctl = fw_ioctl,
.d_dump = nodump,
.d_psize = nosize,
+ .d_discard = nodiscard,
.d_flag = D_OTHER
};
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 33de9064e3d..eb763d88b65 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.102 2014/03/16 05:20:28 dholland Exp $ */
+/* $NetBSD: fd.c,v 1.103 2014/07/25 08:02:19 dholland Exp $ */
/*-
* Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.102 2014/03/16 05:20:28 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.103 2014/07/25 08:02:19 dholland Exp $");
#include "opt_ddb.h"
@@ -230,6 +230,7 @@ const struct bdevsw fd_bdevsw = {
.d_ioctl = fdioctl,
.d_dump = nodump,
.d_psize = nosize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 89ac71915b8..9aa0bfb600f 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcd.c,v 1.111 2014/03/16 05:20:28 dholland Exp $ */
+/* $NetBSD: mcd.c,v 1.112 2014/07/25 08:02:19 dholland Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -56,7 +56,7 @@
/*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.111 2014/03/16 05:20:28 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.112 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -214,6 +214,7 @@ const struct bdevsw mcd_bdevsw = {
.d_ioctl = mcdioctl,
.d_dump = mcddump,
.d_psize = mcdsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c
index 240d7022743..14e382b3b8c 100644
--- a/sys/dev/isa/wt.c
+++ b/sys/dev/isa/wt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wt.c,v 1.84 2014/03/16 05:20:28 dholland Exp $ */
+/* $NetBSD: wt.c,v 1.85 2014/07/25 08:02:19 dholland Exp $ */
/*
* Streamer tape driver.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.84 2014/03/16 05:20:28 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.85 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -164,6 +164,7 @@ const struct bdevsw wt_bdevsw = {
.d_ioctl = wtioctl,
.d_dump = wtdump,
.d_psize = wtsize,
+ .d_discard = nodiscard,
.d_flag = D_TAPE
};
diff --git a/sys/dev/ld.c b/sys/dev/ld.c
index bb77b62a278..addfdba2961 100644
--- a/sys/dev/ld.c
+++ b/sys/dev/ld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.72 2014/03/16 05:20:26 dholland Exp $ */
+/* $NetBSD: ld.c,v 1.73 2014/07/25 08:02:19 dholland Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.72 2014/03/16 05:20:26 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.73 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,6 +88,7 @@ const struct bdevsw ld_bdevsw = {
.d_ioctl = ldioctl,
.d_dump = lddump,
.d_psize = ldsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c
index 1059bf4d15b..e42c5e76fce 100644
--- a/sys/dev/mca/ed_mca.c
+++ b/sys/dev/mca/ed_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.55 2014/03/20 06:48:54 skrll Exp $ */
+/* $NetBSD: ed_mca.c,v 1.56 2014/07/25 08:02:19 dholland Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.55 2014/03/20 06:48:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.56 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,6 +102,7 @@ const struct bdevsw ed_bdevsw = {
.d_ioctl = edmcaioctl,
.d_dump = edmcadump,
.d_psize = edmcasize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/md.c b/sys/dev/md.c
index 925b0537d7b..97058bfff14 100644
--- a/sys/dev/md.c
+++ b/sys/dev/md.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.69 2014/03/16 05:20:26 dholland Exp $ */
+/* $NetBSD: md.c,v 1.70 2014/07/25 08:02:19 dholland Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.69 2014/03/16 05:20:26 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.70 2014/07/25 08:02:19 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_md.h"
@@ -113,6 +113,7 @@ const struct bdevsw md_bdevsw = {
.d_ioctl = mdioctl,
.d_dump = nodump,
.d_psize = mdsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK | D_MPSAFE
};
diff --git a/sys/dev/mscp/mscp_disk.c b/sys/dev/mscp/mscp_disk.c
index 36314220230..56aca991a81 100644
--- a/sys/dev/mscp/mscp_disk.c
+++ b/sys/dev/mscp/mscp_disk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.79 2014/03/16 05:49:41 dholland Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.80 2014/07/25 08:02:19 dholland Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.79 2014/03/16 05:49:41 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.80 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -163,6 +163,7 @@ const struct bdevsw ra_bdevsw = {
.d_ioctl = raioctl,
.d_dump = radump,
.d_psize = rasize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
@@ -584,6 +585,7 @@ const struct bdevsw rx_bdevsw = {
.d_ioctl = rxioctl,
.d_dump = radump,
.d_psize = rxsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
@@ -655,6 +657,7 @@ const struct bdevsw racd_bdevsw = {
.d_ioctl = raioctl,
.d_dump = radump,
.d_psize = rasize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/mscp/mscp_tape.c b/sys/dev/mscp/mscp_tape.c
index 000fdad4282..649dd41b6c6 100644
--- a/sys/dev/mscp/mscp_tape.c
+++ b/sys/dev/mscp/mscp_tape.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_tape.c,v 1.41 2014/03/16 05:20:28 dholland Exp $ */
+/* $NetBSD: mscp_tape.c,v 1.42 2014/07/25 08:02:19 dholland Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.41 2014/03/16 05:20:28 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.42 2014/07/25 08:02:19 dholland Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -130,6 +130,7 @@ const struct bdevsw mt_bdevsw = {
.d_ioctl = mtioctl,
.d_dump = mtdump,
.d_psize = nosize,
+ .d_discard = nodiscard,
.d_flag = D_TAPE
};
diff --git a/sys/dev/ofw/ofdisk.c b/sys/dev/ofw/ofdisk.c
index 6c0a8ecb8d5..fee73d3f7cb 100644
--- a/sys/dev/ofw/ofdisk.c
+++ b/sys/dev/ofw/ofdisk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdisk.c,v 1.45 2014/03/16 05:20:28 dholland Exp $ */
+/* $NetBSD: ofdisk.c,v 1.46 2014/07/25 08:02:20 dholland Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.45 2014/03/16 05:20:28 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.46 2014/07/25 08:02:20 dholland Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -87,6 +87,7 @@ const struct bdevsw ofdisk_bdevsw = {
.d_ioctl = ofdisk_ioctl,
.d_dump = ofdisk_dump,
.d_psize = ofdisk_size,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/qbus/rf.c b/sys/dev/qbus/rf.c
index 2a993ea2f9c..5c761004712 100644
--- a/sys/dev/qbus/rf.c
+++ b/sys/dev/qbus/rf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf.c,v 1.26 2014/03/16 05:20:29 dholland Exp $ */
+/* $NetBSD: rf.c,v 1.27 2014/07/25 08:02:20 dholland Exp $ */
/*
* Copyright (c) 2002 Jochen Kunz.
* All rights reserved.
@@ -36,7 +36,7 @@ TODO:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.26 2014/03/16 05:20:29 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.27 2014/07/25 08:02:20 dholland Exp $");
/* autoconfig stuff */
#include <sys/param.h>
@@ -123,6 +123,7 @@ const struct bdevsw rf_bdevsw = {
.d_ioctl = rfioctl,
.d_dump = rfdump,
.d_psize = rfsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/qbus/rl.c b/sys/dev/qbus/rl.c
index 4847e883f59..9030f9a0c27 100644
--- a/sys/dev/qbus/rl.c
+++ b/sys/dev/qbus/rl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rl.c,v 1.43 2014/03/16 05:20:29 dholland Exp $ */
+/* $NetBSD: rl.c,v 1.44 2014/07/25 08:02:20 dholland Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.43 2014/03/16 05:20:29 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.44 2014/07/25 08:02:20 dholland Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -102,6 +102,7 @@ const struct bdevsw rl_bdevsw = {
.d_ioctl = rlioctl,
.d_dump = rldump,
.d_psize = rlpsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/qbus/ts.c b/sys/dev/qbus/ts.c
index 3360d389f65..973a7573e9f 100644
--- a/sys/dev/qbus/ts.c
+++ b/sys/dev/qbus/ts.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ts.c,v 1.29 2014/03/16 05:20:29 dholland Exp $ */
+/* $NetBSD: ts.c,v 1.30 2014/07/25 08:02:20 dholland Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.29 2014/03/16 05:20:29 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.30 2014/07/25 08:02:20 dholland Exp $");
#undef TSDEBUG
@@ -183,6 +183,7 @@ const struct bdevsw ts_bdevsw = {
.d_ioctl = tsioctl,
.d_dump = tsdump,
.d_psize = nosize,
+ .d_discard = nodiscard,
.d_flag = D_TAPE
};
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 41c1e6157a4..2d702e2f6af 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.310 2014/05/12 15:53:01 christos Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.311 2014/07/25 08:02:20 dholland Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.310 2014/05/12 15:53:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.311 2014/07/25 08:02:20 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -211,6 +211,7 @@ const struct bdevsw raid_bdevsw = {
.d_ioctl = raidioctl,
.d_dump = raiddump,
.d_psize = raidsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c
index 1362ad5194a..6f00ffe5c92 100644
--- a/sys/dev/scsipi/cd.c
+++ b/sys/dev/scsipi/cd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.320 2014/07/12 12:13:01 hannken Exp $ */
+/* $NetBSD: cd.c,v 1.321 2014/07/25 08:02:20 dholland Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.320 2014/07/12 12:13:01 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.321 2014/07/25 08:02:20 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -210,6 +210,7 @@ const struct bdevsw cd_bdevsw = {
.d_ioctl = cdioctl,
.d_dump = cddump,
.d_psize = cdsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index 45db8527a2c..6a63a237339 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.305 2014/03/16 05:20:29 dholland Exp $ */
+/* $NetBSD: sd.c,v 1.306 2014/07/25 08:02:20 dholland Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.305 2014/03/16 05:20:29 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.306 2014/07/25 08:02:20 dholland Exp $");
#include "opt_scsi.h"
@@ -163,6 +163,7 @@ const struct bdevsw sd_bdevsw = {
.d_ioctl = sdioctl,
.d_dump = sddump,
.d_psize = sdsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/scsipi/st.c b/sys/dev/scsipi/st.c
index 423aace8ba3..9786cf28dd3 100644
--- a/sys/dev/scsipi/st.c
+++ b/sys/dev/scsipi/st.c
@@ -1,4 +1,4 @@
-/* $NetBSD: st.c,v 1.223 2014/03/16 05:20:29 dholland Exp $ */
+/* $NetBSD: st.c,v 1.224 2014/07/25 08:02:20 dholland Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.223 2014/03/16 05:20:29 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.224 2014/07/25 08:02:20 dholland Exp $");
#include "opt_scsi.h"
@@ -111,6 +111,7 @@ const struct bdevsw st_bdevsw = {
.d_ioctl = stioctl,
.d_dump = stdump,
.d_psize = nosize,
+ .d_discard = nodiscard,
.d_flag = D_TAPE
};
diff --git a/sys/dev/spi/spiflash.c b/sys/dev/spi/spiflash.c
index 498bcad3423..bc27496367d 100644
--- a/sys/dev/spi/spiflash.c
+++ b/sys/dev/spi/spiflash.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spiflash.c,v 1.13 2014/03/28 11:52:51 hkenken Exp $ */
+/* $NetBSD: spiflash.c,v 1.14 2014/07/25 08:02:20 dholland Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.13 2014/03/28 11:52:51 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.14 2014/07/25 08:02:20 dholland Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -147,6 +147,7 @@ const struct bdevsw spiflash_bdevsw = {
.d_ioctl = spiflash_ioctl,
.d_dump = nodump,
.d_psize = nosize,
+ .d_discard = nodiscard,
.d_flag = D_DISK,
};
diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c
index a49436113ee..3979969c516 100644
--- a/sys/dev/vme/xd.c
+++ b/sys/dev/vme/xd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xd.c,v 1.91 2014/03/16 05:20:29 dholland Exp $ */
+/* $NetBSD: xd.c,v 1.92 2014/07/25 08:02:20 dholland Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.91 2014/03/16 05:20:29 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.92 2014/07/25 08:02:20 dholland Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
@@ -298,6 +298,7 @@ const struct bdevsw xd_bdevsw = {
.d_ioctl = xdioctl,
.d_dump = xddump,
.d_psize = xdsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c
index 00f8ff4c5b1..04f78d367a2 100644
--- a/sys/dev/vme/xy.c
+++ b/sys/dev/vme/xy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xy.c,v 1.95 2014/03/16 05:20:29 dholland Exp $ */
+/* $NetBSD: xy.c,v 1.96 2014/07/25 08:02:20 dholland Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.95 2014/03/16 05:20:29 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.96 2014/07/25 08:02:20 dholland Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
@@ -214,6 +214,7 @@ const struct bdevsw xy_bdevsw = {
.d_ioctl = xyioctl,
.d_dump = xydump,
.d_psize = xysize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 0b277e80c68..9d333a3dbd5 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.230 2014/07/22 13:32:59 pooka Exp $ */
+/* $NetBSD: vnd.c,v 1.231 2014/07/25 08:02:19 dholland Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.230 2014/07/22 13:32:59 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.231 2014/07/25 08:02:19 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -203,6 +203,7 @@ const struct bdevsw vnd_bdevsw = {
.d_ioctl = vndioctl,
.d_dump = vnddump,
.d_psize = vndsize,
+ .d_discard = nodiscard,
.d_flag = D_DISK
};