# HG changeset patch
# Parent a796c93059f80c479b57d85632d30a89be6c9d22
Add d_discard to all struct bdevsw instances.

I've set them all to nodiscard. Some of them (wd, dk, vnd, ld,
raidframe, maybe cgd) should be implemented for real.

diff -r a796c93059f8 sys/arch/acorn32/mainbus/fd.c
--- a/sys/arch/acorn32/mainbus/fd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/acorn32/mainbus/fd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -274,6 +274,7 @@
 	.d_ioctl = fdioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/amiga/dev/fd.c
--- a/sys/arch/amiga/dev/fd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/amiga/dev/fd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -260,6 +260,7 @@
 	.d_ioctl = fdioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/arc/jazz/fd.c
--- a/sys/arch/arc/jazz/fd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/arc/jazz/fd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -193,6 +193,7 @@
 	.d_ioctl = fdioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/atari/dev/fd.c
--- a/sys/arch/atari/dev/fd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/atari/dev/fd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -286,6 +286,7 @@
 	.d_ioctl = fdioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/atari/dev/hdfd.c
--- a/sys/arch/atari/dev/hdfd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/atari/dev/hdfd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -292,6 +292,7 @@
 	.d_ioctl = fdioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/dreamcast/dev/gdrom.c
--- a/sys/arch/dreamcast/dev/gdrom.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/dreamcast/dev/gdrom.c	Sun Mar 23 02:20:13 2014 -0400
@@ -70,6 +70,7 @@
 	.d_ioctl = gdromioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/dreamcast/dev/maple/mmemcard.c
--- a/sys/arch/dreamcast/dev/maple/mmemcard.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/dreamcast/dev/maple/mmemcard.c	Sun Mar 23 02:20:13 2014 -0400
@@ -195,6 +195,7 @@
 	.d_ioctl = mmemioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/emips/ebus/ace_ebus.c
--- a/sys/arch/emips/ebus/ace_ebus.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/emips/ebus/ace_ebus.c	Sun Mar 23 02:20:13 2014 -0400
@@ -1562,6 +1562,7 @@
 	.d_ioctl = aceioctl,
 	.d_dump = acedump,
 	.d_psize = acesize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/emips/ebus/flash_ebus.c
--- a/sys/arch/emips/ebus/flash_ebus.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/emips/ebus/flash_ebus.c	Sun Mar 23 02:20:13 2014 -0400
@@ -1402,6 +1402,7 @@
 	.d_ioctl = eflashioctl,
 	.d_dump = eflashdump,
 	.d_psize = eflashsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/hp300/dev/ct.c
--- a/sys/arch/hp300/dev/ct.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/hp300/dev/ct.c	Sun Mar 23 02:20:13 2014 -0400
@@ -159,6 +159,7 @@
 	.d_ioctl = ctioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_TAPE
 };
 
diff -r a796c93059f8 sys/arch/hp300/dev/mt.c
--- a/sys/arch/hp300/dev/mt.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/hp300/dev/mt.c	Sun Mar 23 02:20:13 2014 -0400
@@ -148,6 +148,7 @@
 	.d_ioctl = mtioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_TAPE
 };
 
diff -r a796c93059f8 sys/arch/hp300/dev/rd.c
--- a/sys/arch/hp300/dev/rd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/hp300/dev/rd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -288,6 +288,7 @@
 	.d_ioctl = rdioctl,
 	.d_dump = rddump,
 	.d_psize = rdsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/mac68k/obio/iwm_fd.c
--- a/sys/arch/mac68k/obio/iwm_fd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/mac68k/obio/iwm_fd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -239,6 +239,7 @@
 	.d_ioctl = fdioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/mipsco/obio/i82072.c
--- a/sys/arch/mipsco/obio/i82072.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/mipsco/obio/i82072.c	Sun Mar 23 02:20:13 2014 -0400
@@ -55,6 +55,7 @@
 	.d_ioctl = noioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/sparc/dev/fd.c
--- a/sys/arch/sparc/dev/fd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/sparc/dev/fd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -313,6 +313,7 @@
 	.d_ioctl = fdioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/sparc64/dev/fdc.c
--- a/sys/arch/sparc64/dev/fdc.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/sparc64/dev/fdc.c	Sun Mar 23 02:20:13 2014 -0400
@@ -345,6 +345,7 @@
 	.d_ioctl = fdioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/sun3/dev/fd.c
--- a/sys/arch/sun3/dev/fd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/sun3/dev/fd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -285,6 +285,7 @@
 	.d_ioctl = fdioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/sun3/dev/xd.c
--- a/sys/arch/sun3/dev/xd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/sun3/dev/xd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -292,6 +292,7 @@
 	.d_ioctl = xdioctl,
 	.d_dump = xddump,
 	.d_psize = xdsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/sun3/dev/xy.c
--- a/sys/arch/sun3/dev/xy.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/sun3/dev/xy.c	Sun Mar 23 02:20:13 2014 -0400
@@ -223,6 +223,7 @@
 	.d_ioctl = xyioctl,
 	.d_dump = xydump,
 	.d_psize = xysize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/vax/mba/hp.c
--- a/sys/arch/vax/mba/hp.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/vax/mba/hp.c	Sun Mar 23 02:20:13 2014 -0400
@@ -101,6 +101,7 @@
 	.d_ioctl = hpioctl,
 	.d_dump = nulldump,
 	.d_psize = hppsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/vax/vax/ctu.c
--- a/sys/arch/vax/vax/ctu.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/vax/vax/ctu.c	Sun Mar 23 02:20:13 2014 -0400
@@ -105,6 +105,7 @@
 	.d_ioctl = noioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_TAPE
 };
 
diff -r a796c93059f8 sys/arch/vax/vsa/hdc9224.c
--- a/sys/arch/vax/vsa/hdc9224.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/vax/vsa/hdc9224.c	Sun Mar 23 02:20:13 2014 -0400
@@ -201,6 +201,7 @@
 	.d_ioctl = rdioctl,
 	.d_dump = nulldump,
 	.d_psize = rdpsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/x68k/dev/bmd.c
--- a/sys/arch/x68k/dev/bmd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/x68k/dev/bmd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -112,6 +112,7 @@
 	.d_ioctl = bmdioctl,
 	.d_dump = bmddump,
 	.d_psize = bmdsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/x68k/dev/fd.c
--- a/sys/arch/x68k/dev/fd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/x68k/dev/fd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -277,6 +277,7 @@
 	.d_ioctl = fdioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/arch/xen/xen/xbd_xenbus.c
--- a/sys/arch/xen/xen/xbd_xenbus.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/arch/xen/xen/xbd_xenbus.c	Sun Mar 23 02:20:13 2014 -0400
@@ -197,6 +197,7 @@
 	.d_ioctl = xbdioctl,
 	.d_dump = xbddump,
 	.d_psize = xbdsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/altmem/altmem.c
--- a/sys/dev/altmem/altmem.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/altmem/altmem.c	Sun Mar 23 02:20:13 2014 -0400
@@ -66,6 +66,7 @@
 	.d_ioctl = altmemioctl,
 	.d_dump = nodump,
 	.d_psize = altmemsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 const struct cdevsw altmem_cdevsw = {
diff -r a796c93059f8 sys/dev/ata/wd.c
--- a/sys/dev/ata/wd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/ata/wd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -148,6 +148,7 @@
 	.d_ioctl = wdioctl,
 	.d_dump = wddump,
 	.d_psize = wdsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/ccd.c
--- a/sys/dev/ccd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/ccd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -185,6 +185,7 @@
 	.d_ioctl = ccdioctl,
 	.d_dump = nodump,
 	.d_psize = ccdsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK | D_MPSAFE
 };
 
diff -r a796c93059f8 sys/dev/cgd.c
--- a/sys/dev/cgd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/cgd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -75,6 +75,7 @@
 	.d_ioctl = cgdioctl,
 	.d_dump = cgddump,
 	.d_psize = cgdsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/dkwedge/dk.c
--- a/sys/dev/dkwedge/dk.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/dkwedge/dk.c	Sun Mar 23 02:20:13 2014 -0400
@@ -116,6 +116,7 @@
 	.d_ioctl = dkioctl,
 	.d_dump = dkdump,
 	.d_psize = dksize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/dm/device-mapper.c
--- a/sys/dev/dm/device-mapper.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/dm/device-mapper.c	Sun Mar 23 02:20:13 2014 -0400
@@ -84,6 +84,7 @@
 	.d_ioctl = dmioctl,
 	.d_dump = nodump,
 	.d_psize = dmsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK | D_MPSAFE
 };
 
diff -r a796c93059f8 sys/dev/flash/flash.c
--- a/sys/dev/flash/flash.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/flash/flash.c	Sun Mar 23 02:20:13 2014 -0400
@@ -98,6 +98,7 @@
 	.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 -r a796c93059f8 sys/dev/fss.c
--- a/sys/dev/fss.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/fss.c	Sun Mar 23 02:20:13 2014 -0400
@@ -101,9 +101,11 @@
 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 -r a796c93059f8 sys/dev/gpib/ct.c
--- a/sys/dev/gpib/ct.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/gpib/ct.c	Sun Mar 23 02:20:13 2014 -0400
@@ -187,6 +187,7 @@
 	.d_ioctl = ctioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_TAPE
 };
 
diff -r a796c93059f8 sys/dev/gpib/mt.c
--- a/sys/dev/gpib/mt.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/gpib/mt.c	Sun Mar 23 02:20:13 2014 -0400
@@ -167,6 +167,7 @@
 	.d_ioctl = mtioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_TAPE
 };
 
diff -r a796c93059f8 sys/dev/gpib/rd.c
--- a/sys/dev/gpib/rd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/gpib/rd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -261,6 +261,7 @@
 	.d_ioctl = rdioctl,
 	.d_dump = rddump,
 	.d_psize = rdsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/ieee1394/fwdev.c
--- a/sys/dev/ieee1394/fwdev.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/ieee1394/fwdev.c	Sun Mar 23 02:20:13 2014 -0400
@@ -78,6 +78,7 @@
 	.d_ioctl = fw_ioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_OTHER
 };
 
diff -r a796c93059f8 sys/dev/isa/fd.c
--- a/sys/dev/isa/fd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/isa/fd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -230,6 +230,7 @@
 	.d_ioctl = fdioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/isa/mcd.c
--- a/sys/dev/isa/mcd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/isa/mcd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -214,6 +214,7 @@
 	.d_ioctl = mcdioctl,
 	.d_dump = mcddump,
 	.d_psize = mcdsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/isa/wt.c
--- a/sys/dev/isa/wt.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/isa/wt.c	Sun Mar 23 02:20:13 2014 -0400
@@ -164,6 +164,7 @@
 	.d_ioctl = wtioctl,
 	.d_dump = wtdump,
 	.d_psize = wtsize,
+	.d_discard = nodiscard,
 	.d_flag = D_TAPE
 };
 
diff -r a796c93059f8 sys/dev/ld.c
--- a/sys/dev/ld.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/ld.c	Sun Mar 23 02:20:13 2014 -0400
@@ -88,6 +88,7 @@
 	.d_ioctl = ldioctl,
 	.d_dump = lddump,
 	.d_psize = ldsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/mca/ed_mca.c
--- a/sys/dev/mca/ed_mca.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/mca/ed_mca.c	Sun Mar 23 02:20:13 2014 -0400
@@ -102,6 +102,7 @@
 	.d_ioctl = edmcaioctl,
 	.d_dump = edmcadump,
 	.d_psize = edmcasize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/md.c
--- a/sys/dev/md.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/md.c	Sun Mar 23 02:20:13 2014 -0400
@@ -113,6 +113,7 @@
 	.d_ioctl = mdioctl,
 	.d_dump = nodump,
 	.d_psize = mdsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK | D_MPSAFE
 };
 
diff -r a796c93059f8 sys/dev/mscp/mscp_disk.c
--- a/sys/dev/mscp/mscp_disk.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/mscp/mscp_disk.c	Sun Mar 23 02:20:13 2014 -0400
@@ -163,6 +163,7 @@
 	.d_ioctl = raioctl,
 	.d_dump = radump,
 	.d_psize = rasize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
@@ -584,6 +585,7 @@
 	.d_ioctl = rxioctl,
 	.d_dump = radump,
 	.d_psize = rxsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
@@ -655,6 +657,7 @@
 	.d_ioctl = raioctl,
 	.d_dump = radump,
 	.d_psize = rasize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/mscp/mscp_tape.c
--- a/sys/dev/mscp/mscp_tape.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/mscp/mscp_tape.c	Sun Mar 23 02:20:13 2014 -0400
@@ -130,6 +130,7 @@
 	.d_ioctl = mtioctl,
 	.d_dump = mtdump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_TAPE
 };
 
diff -r a796c93059f8 sys/dev/ofw/ofdisk.c
--- a/sys/dev/ofw/ofdisk.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/ofw/ofdisk.c	Sun Mar 23 02:20:13 2014 -0400
@@ -87,6 +87,7 @@
 	.d_ioctl = ofdisk_ioctl,
 	.d_dump = ofdisk_dump,
 	.d_psize = ofdisk_size,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/qbus/rf.c
--- a/sys/dev/qbus/rf.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/qbus/rf.c	Sun Mar 23 02:20:13 2014 -0400
@@ -123,6 +123,7 @@
 	.d_ioctl = rfioctl,
 	.d_dump = rfdump,
 	.d_psize = rfsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/qbus/rl.c
--- a/sys/dev/qbus/rl.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/qbus/rl.c	Sun Mar 23 02:20:13 2014 -0400
@@ -102,6 +102,7 @@
 	.d_ioctl = rlioctl,
 	.d_dump = rldump,
 	.d_psize = rlpsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/qbus/ts.c
--- a/sys/dev/qbus/ts.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/qbus/ts.c	Sun Mar 23 02:20:13 2014 -0400
@@ -183,6 +183,7 @@
 	.d_ioctl = tsioctl,
 	.d_dump = tsdump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_TAPE
 };
 
diff -r a796c93059f8 sys/dev/raidframe/rf_netbsdkintf.c
--- a/sys/dev/raidframe/rf_netbsdkintf.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/raidframe/rf_netbsdkintf.c	Sun Mar 23 02:20:13 2014 -0400
@@ -211,6 +211,7 @@
 	.d_ioctl = raidioctl,
 	.d_dump = raiddump,
 	.d_psize = raidsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/scsipi/cd.c
--- a/sys/dev/scsipi/cd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/scsipi/cd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -210,6 +210,7 @@
 	.d_ioctl = cdioctl,
 	.d_dump = cddump,
 	.d_psize = cdsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/scsipi/sd.c
--- a/sys/dev/scsipi/sd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/scsipi/sd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -163,6 +163,7 @@
 	.d_ioctl = sdioctl,
 	.d_dump = sddump,
 	.d_psize = sdsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/scsipi/st.c
--- a/sys/dev/scsipi/st.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/scsipi/st.c	Sun Mar 23 02:20:13 2014 -0400
@@ -111,6 +111,7 @@
 	.d_ioctl = stioctl,
 	.d_dump = stdump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_TAPE
 };
 
diff -r a796c93059f8 sys/dev/spi/spiflash.c
--- a/sys/dev/spi/spiflash.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/spi/spiflash.c	Sun Mar 23 02:20:13 2014 -0400
@@ -147,6 +147,7 @@
 	.d_ioctl = spiflash_ioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK,
 };
 
diff -r a796c93059f8 sys/dev/vme/xd.c
--- a/sys/dev/vme/xd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/vme/xd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -298,6 +298,7 @@
 	.d_ioctl = xdioctl,
 	.d_dump = xddump,
 	.d_psize = xdsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/vme/xy.c
--- a/sys/dev/vme/xy.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/vme/xy.c	Sun Mar 23 02:20:13 2014 -0400
@@ -214,6 +214,7 @@
 	.d_ioctl = xyioctl,
 	.d_dump = xydump,
 	.d_psize = xysize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/dev/vnd.c
--- a/sys/dev/vnd.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/dev/vnd.c	Sun Mar 23 02:20:13 2014 -0400
@@ -203,6 +203,7 @@
 	.d_ioctl = vndioctl,
 	.d_dump = vnddump,
 	.d_psize = vndsize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/rump/librump/rumpvfs/rumpblk.c
--- a/sys/rump/librump/rumpvfs/rumpblk.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/rump/librump/rumpvfs/rumpblk.c	Sun Mar 23 02:20:13 2014 -0400
@@ -101,6 +101,7 @@
 	.d_ioctl = rumpblk_ioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
@@ -111,6 +112,7 @@
 	.d_ioctl = rumpblk_ioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 
diff -r a796c93059f8 sys/uvm/uvm_swap.c
--- a/sys/uvm/uvm_swap.c	Sun Mar 23 02:14:34 2014 -0400
+++ b/sys/uvm/uvm_swap.c	Sun Mar 23 02:20:13 2014 -0400
@@ -1283,6 +1283,7 @@
 	.d_ioctl = noioctl,
 	.d_dump = nodump,
 	.d_psize = nosize,
+	.d_discard = nodiscard,
 	.d_flag = D_OTHER
 };