Module Name: src Committed By: dholland Date: Fri Jul 25 08:02:20 UTC 2014
Modified Files: src/sys/arch/acorn32/mainbus: fd.c src/sys/arch/amiga/dev: fd.c src/sys/arch/arc/jazz: fd.c src/sys/arch/atari/dev: fd.c hdfd.c src/sys/arch/dreamcast/dev: gdrom.c src/sys/arch/dreamcast/dev/maple: mmemcard.c src/sys/arch/emips/ebus: ace_ebus.c flash_ebus.c src/sys/arch/hp300/dev: ct.c mt.c rd.c src/sys/arch/mac68k/obio: iwm_fd.c src/sys/arch/mipsco/obio: i82072.c src/sys/arch/sparc/dev: fd.c src/sys/arch/sparc64/dev: fdc.c src/sys/arch/sun3/dev: fd.c xd.c xy.c src/sys/arch/vax/mba: hp.c src/sys/arch/vax/vax: ctu.c src/sys/arch/vax/vsa: hdc9224.c src/sys/arch/x68k/dev: bmd.c fd.c src/sys/arch/xen/xen: xbd_xenbus.c src/sys/dev: ccd.c cgd.c fss.c ld.c md.c vnd.c src/sys/dev/altmem: altmem.c src/sys/dev/ata: wd.c src/sys/dev/dkwedge: dk.c src/sys/dev/dm: device-mapper.c src/sys/dev/flash: flash.c src/sys/dev/gpib: ct.c mt.c rd.c src/sys/dev/ieee1394: fwdev.c src/sys/dev/isa: fd.c mcd.c wt.c src/sys/dev/mca: ed_mca.c src/sys/dev/mscp: mscp_disk.c mscp_tape.c src/sys/dev/ofw: ofdisk.c src/sys/dev/qbus: rf.c rl.c ts.c src/sys/dev/raidframe: rf_netbsdkintf.c src/sys/dev/scsipi: cd.c sd.c st.c src/sys/dev/spi: spiflash.c src/sys/dev/vme: xd.c xy.c src/sys/rump/librump/rumpvfs: rumpblk.c src/sys/uvm: uvm_swap.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/acorn32/mainbus/fd.c cvs rdiff -u -r1.89 -r1.90 src/sys/arch/amiga/dev/fd.c cvs rdiff -u -r1.43 -r1.44 src/sys/arch/arc/jazz/fd.c cvs rdiff -u -r1.77 -r1.78 src/sys/arch/atari/dev/fd.c cvs rdiff -u -r1.76 -r1.77 src/sys/arch/atari/dev/hdfd.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/dreamcast/dev/gdrom.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/dreamcast/dev/maple/mmemcard.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/emips/ebus/ace_ebus.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/emips/ebus/flash_ebus.c cvs rdiff -u -r1.59 -r1.60 src/sys/arch/hp300/dev/ct.c cvs rdiff -u -r1.52 -r1.53 src/sys/arch/hp300/dev/mt.c cvs rdiff -u -r1.95 -r1.96 src/sys/arch/hp300/dev/rd.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/mac68k/obio/iwm_fd.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mipsco/obio/i82072.c cvs rdiff -u -r1.152 -r1.153 src/sys/arch/sparc/dev/fd.c cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sparc64/dev/fdc.c cvs rdiff -u -r1.75 -r1.76 src/sys/arch/sun3/dev/fd.c cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sun3/dev/xd.c cvs rdiff -u -r1.74 -r1.75 src/sys/arch/sun3/dev/xy.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/vax/mba/hp.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/vax/vax/ctu.c cvs rdiff -u -r1.52 -r1.53 src/sys/arch/vax/vsa/hdc9224.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x68k/dev/bmd.c cvs rdiff -u -r1.108 -r1.109 src/sys/arch/x68k/dev/fd.c cvs rdiff -u -r1.63 -r1.64 src/sys/arch/xen/xen/xbd_xenbus.c cvs rdiff -u -r1.149 -r1.150 src/sys/dev/ccd.c cvs rdiff -u -r1.88 -r1.89 src/sys/dev/cgd.c cvs rdiff -u -r1.89 -r1.90 src/sys/dev/fss.c cvs rdiff -u -r1.72 -r1.73 src/sys/dev/ld.c cvs rdiff -u -r1.69 -r1.70 src/sys/dev/md.c cvs rdiff -u -r1.230 -r1.231 src/sys/dev/vnd.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/altmem/altmem.c cvs rdiff -u -r1.407 -r1.408 src/sys/dev/ata/wd.c cvs rdiff -u -r1.69 -r1.70 src/sys/dev/dkwedge/dk.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/dm/device-mapper.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/flash/flash.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/gpib/ct.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/gpib/mt.c cvs rdiff -u -r1.33 -r1.34 src/sys/dev/gpib/rd.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ieee1394/fwdev.c cvs rdiff -u -r1.102 -r1.103 src/sys/dev/isa/fd.c cvs rdiff -u -r1.111 -r1.112 src/sys/dev/isa/mcd.c cvs rdiff -u -r1.84 -r1.85 src/sys/dev/isa/wt.c cvs rdiff -u -r1.55 -r1.56 src/sys/dev/mca/ed_mca.c cvs rdiff -u -r1.79 -r1.80 src/sys/dev/mscp/mscp_disk.c cvs rdiff -u -r1.41 -r1.42 src/sys/dev/mscp/mscp_tape.c cvs rdiff -u -r1.45 -r1.46 src/sys/dev/ofw/ofdisk.c cvs rdiff -u -r1.26 -r1.27 src/sys/dev/qbus/rf.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/qbus/rl.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/qbus/ts.c cvs rdiff -u -r1.310 -r1.311 src/sys/dev/raidframe/rf_netbsdkintf.c cvs rdiff -u -r1.320 -r1.321 src/sys/dev/scsipi/cd.c cvs rdiff -u -r1.305 -r1.306 src/sys/dev/scsipi/sd.c cvs rdiff -u -r1.223 -r1.224 src/sys/dev/scsipi/st.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/spi/spiflash.c cvs rdiff -u -r1.91 -r1.92 src/sys/dev/vme/xd.c cvs rdiff -u -r1.95 -r1.96 src/sys/dev/vme/xy.c cvs rdiff -u -r1.55 -r1.56 src/sys/rump/librump/rumpvfs/rumpblk.c cvs rdiff -u -r1.170 -r1.171 src/sys/uvm/uvm_swap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/acorn32/mainbus/fd.c diff -u src/sys/arch/acorn32/mainbus/fd.c:1.53 src/sys/arch/acorn32/mainbus/fd.c:1.54 --- src/sys/arch/acorn32/mainbus/fd.c:1.53 Sun Mar 16 05:20:22 2014 +++ src/sys/arch/acorn32/mainbus/fd.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.53 2014/03/16 05:20:22 dholland Exp $ */ +/* $NetBSD: fd.c,v 1.54 2014/07/25 08:02:18 dholland Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.53 2014/03/16 05:20:22 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.54 2014/07/25 08:02:18 dholland Exp $"); #include "opt_ddb.h" @@ -274,6 +274,7 @@ const struct bdevsw fd_bdevsw = { .d_ioctl = fdioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/amiga/dev/fd.c diff -u src/sys/arch/amiga/dev/fd.c:1.89 src/sys/arch/amiga/dev/fd.c:1.90 --- src/sys/arch/amiga/dev/fd.c:1.89 Sun Mar 16 05:20:22 2014 +++ src/sys/arch/amiga/dev/fd.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.89 2014/03/16 05:20:22 dholland Exp $ */ +/* $NetBSD: fd.c,v 1.90 2014/07/25 08:02:18 dholland Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.89 2014/03/16 05:20:22 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.90 2014/07/25 08:02:18 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -260,6 +260,7 @@ const struct bdevsw fd_bdevsw = { .d_ioctl = fdioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/arc/jazz/fd.c diff -u src/sys/arch/arc/jazz/fd.c:1.43 src/sys/arch/arc/jazz/fd.c:1.44 --- src/sys/arch/arc/jazz/fd.c:1.43 Sun Mar 16 05:20:22 2014 +++ src/sys/arch/arc/jazz/fd.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.43 2014/03/16 05:20:22 dholland Exp $ */ +/* $NetBSD: fd.c,v 1.44 2014/07/25 08:02:18 dholland Exp $ */ /* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */ /* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */ @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.43 2014/03/16 05:20:22 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.44 2014/07/25 08:02:18 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -193,6 +193,7 @@ const struct bdevsw fd_bdevsw = { .d_ioctl = fdioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/atari/dev/fd.c diff -u src/sys/arch/atari/dev/fd.c:1.77 src/sys/arch/atari/dev/fd.c:1.78 --- src/sys/arch/atari/dev/fd.c:1.77 Sun Mar 16 05:20:23 2014 +++ src/sys/arch/atari/dev/fd.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.77 2014/03/16 05:20:23 dholland Exp $ */ +/* $NetBSD: fd.c,v 1.78 2014/07/25 08:02:18 dholland Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.77 2014/03/16 05:20:23 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.78 2014/07/25 08:02:18 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -286,6 +286,7 @@ const struct bdevsw fd_bdevsw = { .d_ioctl = fdioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/atari/dev/hdfd.c diff -u src/sys/arch/atari/dev/hdfd.c:1.76 src/sys/arch/atari/dev/hdfd.c:1.77 --- src/sys/arch/atari/dev/hdfd.c:1.76 Sun Mar 16 05:20:23 2014 +++ src/sys/arch/atari/dev/hdfd.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: hdfd.c,v 1.76 2014/03/16 05:20:23 dholland Exp $ */ +/* $NetBSD: hdfd.c,v 1.77 2014/07/25 08:02:18 dholland Exp $ */ /*- * Copyright (c) 1996 Leo Weppelman @@ -91,7 +91,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.76 2014/03/16 05:20:23 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.77 2014/07/25 08:02:18 dholland Exp $"); #include "opt_ddb.h" @@ -292,6 +292,7 @@ const struct bdevsw fd_bdevsw = { .d_ioctl = fdioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/dreamcast/dev/gdrom.c diff -u src/sys/arch/dreamcast/dev/gdrom.c:1.38 src/sys/arch/dreamcast/dev/gdrom.c:1.39 --- src/sys/arch/dreamcast/dev/gdrom.c:1.38 Tue Mar 18 08:08:55 2014 +++ src/sys/arch/dreamcast/dev/gdrom.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: gdrom.c,v 1.38 2014/03/18 08:08:55 martin Exp $ */ +/* $NetBSD: gdrom.c,v 1.39 2014/07/25 08:02:18 dholland Exp $ */ /*- * Copyright (c) 2001 Marcus Comstedt @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: gdrom.c,v 1.38 2014/03/18 08:08:55 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gdrom.c,v 1.39 2014/07/25 08:02:18 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -70,6 +70,7 @@ const struct bdevsw gdrom_bdevsw = { .d_ioctl = gdromioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/dreamcast/dev/maple/mmemcard.c diff -u src/sys/arch/dreamcast/dev/maple/mmemcard.c:1.22 src/sys/arch/dreamcast/dev/maple/mmemcard.c:1.23 --- src/sys/arch/dreamcast/dev/maple/mmemcard.c:1.22 Wed Mar 26 16:08:45 2014 +++ src/sys/arch/dreamcast/dev/maple/mmemcard.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mmemcard.c,v 1.22 2014/03/26 16:08:45 christos Exp $ */ +/* $NetBSD: mmemcard.c,v 1.23 2014/07/25 08:02:18 dholland Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mmemcard.c,v 1.22 2014/03/26 16:08:45 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mmemcard.c,v 1.23 2014/07/25 08:02:18 dholland Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -195,6 +195,7 @@ const struct bdevsw mmem_bdevsw = { .d_ioctl = mmemioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/emips/ebus/ace_ebus.c diff -u src/sys/arch/emips/ebus/ace_ebus.c:1.10 src/sys/arch/emips/ebus/ace_ebus.c:1.11 --- src/sys/arch/emips/ebus/ace_ebus.c:1.10 Sun Mar 16 05:20:23 2014 +++ src/sys/arch/emips/ebus/ace_ebus.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ace_ebus.c,v 1.10 2014/03/16 05:20:23 dholland Exp $ */ +/* $NetBSD: ace_ebus.c,v 1.11 2014/07/25 08:02:18 dholland Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.10 2014/03/16 05:20:23 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.11 2014/07/25 08:02:18 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1462,7 +1462,7 @@ sysace_send_config(struct ace_softc *sc, * Rest of code lifted with mods from the dev\ata\wd.c driver */ -/* $NetBSD: ace_ebus.c,v 1.10 2014/03/16 05:20:23 dholland Exp $ */ +/* $NetBSD: ace_ebus.c,v 1.11 2014/07/25 08:02:18 dholland Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -1562,6 +1562,7 @@ const struct bdevsw ace_bdevsw = { .d_ioctl = aceioctl, .d_dump = acedump, .d_psize = acesize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/emips/ebus/flash_ebus.c diff -u src/sys/arch/emips/ebus/flash_ebus.c:1.8 src/sys/arch/emips/ebus/flash_ebus.c:1.9 --- src/sys/arch/emips/ebus/flash_ebus.c:1.8 Sun Mar 16 05:20:23 2014 +++ src/sys/arch/emips/ebus/flash_ebus.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: flash_ebus.c,v 1.8 2014/03/16 05:20:23 dholland Exp $ */ +/* $NetBSD: flash_ebus.c,v 1.9 2014/07/25 08:02:18 dholland Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.8 2014/03/16 05:20:23 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.9 2014/07/25 08:02:18 dholland Exp $"); /* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device * Extended to include the Intel JS28F256P30T95. @@ -1302,7 +1302,7 @@ static int eflash_write_at (struct eflas /* Rest of code lifted with mods from the dev\ata\wd.c driver */ -/* $NetBSD: flash_ebus.c,v 1.8 2014/03/16 05:20:23 dholland Exp $ */ +/* $NetBSD: flash_ebus.c,v 1.9 2014/07/25 08:02:18 dholland Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -1402,6 +1402,7 @@ const struct bdevsw eflash_bdevsw = { .d_ioctl = eflashioctl, .d_dump = eflashdump, .d_psize = eflashsize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/hp300/dev/ct.c diff -u src/sys/arch/hp300/dev/ct.c:1.59 src/sys/arch/hp300/dev/ct.c:1.60 --- src/sys/arch/hp300/dev/ct.c:1.59 Mon Mar 24 19:42:58 2014 +++ src/sys/arch/hp300/dev/ct.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ct.c,v 1.59 2014/03/24 19:42:58 christos Exp $ */ +/* $NetBSD: ct.c,v 1.60 2014/07/25 08:02:18 dholland Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.59 2014/03/24 19:42:58 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.60 2014/07/25 08:02:18 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -159,6 +159,7 @@ const struct bdevsw ct_bdevsw = { .d_ioctl = ctioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_TAPE }; Index: src/sys/arch/hp300/dev/mt.c diff -u src/sys/arch/hp300/dev/mt.c:1.52 src/sys/arch/hp300/dev/mt.c:1.53 --- src/sys/arch/hp300/dev/mt.c:1.52 Mon Mar 24 19:42:58 2014 +++ src/sys/arch/hp300/dev/mt.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mt.c,v 1.52 2014/03/24 19:42:58 christos Exp $ */ +/* $NetBSD: mt.c,v 1.53 2014/07/25 08:02:18 dholland Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.52 2014/03/24 19:42:58 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.53 2014/07/25 08:02:18 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -148,6 +148,7 @@ const struct bdevsw mt_bdevsw = { .d_ioctl = mtioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_TAPE }; Index: src/sys/arch/hp300/dev/rd.c diff -u src/sys/arch/hp300/dev/rd.c:1.95 src/sys/arch/hp300/dev/rd.c:1.96 --- src/sys/arch/hp300/dev/rd.c:1.95 Mon Mar 24 19:42:58 2014 +++ src/sys/arch/hp300/dev/rd.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rd.c,v 1.95 2014/03/24 19:42:58 christos Exp $ */ +/* $NetBSD: rd.c,v 1.96 2014/07/25 08:02:18 dholland Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.95 2014/03/24 19:42:58 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.96 2014/07/25 08:02:18 dholland Exp $"); #include "opt_useleds.h" @@ -288,6 +288,7 @@ const struct bdevsw rd_bdevsw = { .d_ioctl = rdioctl, .d_dump = rddump, .d_psize = rdsize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/mac68k/obio/iwm_fd.c diff -u src/sys/arch/mac68k/obio/iwm_fd.c:1.48 src/sys/arch/mac68k/obio/iwm_fd.c:1.49 --- src/sys/arch/mac68k/obio/iwm_fd.c:1.48 Sun Mar 16 05:20:25 2014 +++ src/sys/arch/mac68k/obio/iwm_fd.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: iwm_fd.c,v 1.48 2014/03/16 05:20:25 dholland Exp $ */ +/* $NetBSD: iwm_fd.c,v 1.49 2014/07/25 08:02:18 dholland Exp $ */ /* * Copyright (c) 1997, 1998 Hauke Fath. All rights reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.48 2014/03/16 05:20:25 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.49 2014/07/25 08:02:18 dholland Exp $"); #include "locators.h" @@ -239,6 +239,7 @@ const struct bdevsw fd_bdevsw = { .d_ioctl = fdioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/mipsco/obio/i82072.c diff -u src/sys/arch/mipsco/obio/i82072.c:1.13 src/sys/arch/mipsco/obio/i82072.c:1.14 --- src/sys/arch/mipsco/obio/i82072.c:1.13 Sun Mar 16 05:20:25 2014 +++ src/sys/arch/mipsco/obio/i82072.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: i82072.c,v 1.13 2014/03/16 05:20:25 dholland Exp $ */ +/* $NetBSD: i82072.c,v 1.14 2014/07/25 08:02:18 dholland Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82072.c,v 1.13 2014/03/16 05:20:25 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82072.c,v 1.14 2014/07/25 08:02:18 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -55,6 +55,7 @@ const struct bdevsw fd_bdevsw = { .d_ioctl = noioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/sparc/dev/fd.c diff -u src/sys/arch/sparc/dev/fd.c:1.152 src/sys/arch/sparc/dev/fd.c:1.153 --- src/sys/arch/sparc/dev/fd.c:1.152 Sun Mar 16 05:20:25 2014 +++ src/sys/arch/sparc/dev/fd.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.152 2014/03/16 05:20:25 dholland Exp $ */ +/* $NetBSD: fd.c,v 1.153 2014/07/25 08:02:18 dholland Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.152 2014/03/16 05:20:25 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.153 2014/07/25 08:02:18 dholland Exp $"); #include "opt_ddb.h" #include "opt_md.h" @@ -313,6 +313,7 @@ const struct bdevsw fd_bdevsw = { .d_ioctl = fdioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/sparc64/dev/fdc.c diff -u src/sys/arch/sparc64/dev/fdc.c:1.39 src/sys/arch/sparc64/dev/fdc.c:1.40 --- src/sys/arch/sparc64/dev/fdc.c:1.39 Sun Mar 16 05:20:26 2014 +++ src/sys/arch/sparc64/dev/fdc.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fdc.c,v 1.39 2014/03/16 05:20:26 dholland Exp $ */ +/* $NetBSD: fdc.c,v 1.40 2014/07/25 08:02:18 dholland Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.39 2014/03/16 05:20:26 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.40 2014/07/25 08:02:18 dholland Exp $"); #include "opt_ddb.h" #include "opt_md.h" @@ -345,6 +345,7 @@ const struct bdevsw fd_bdevsw = { .d_ioctl = fdioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/sun3/dev/fd.c diff -u src/sys/arch/sun3/dev/fd.c:1.75 src/sys/arch/sun3/dev/fd.c:1.76 --- src/sys/arch/sun3/dev/fd.c:1.75 Sun Mar 16 05:20:26 2014 +++ src/sys/arch/sun3/dev/fd.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.75 2014/03/16 05:20:26 dholland Exp $ */ +/* $NetBSD: fd.c,v 1.76 2014/07/25 08:02:18 dholland Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.75 2014/03/16 05:20:26 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.76 2014/07/25 08:02:18 dholland Exp $"); #include "opt_ddb.h" @@ -285,6 +285,7 @@ const struct bdevsw fd_bdevsw = { .d_ioctl = fdioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/sun3/dev/xd.c diff -u src/sys/arch/sun3/dev/xd.c:1.69 src/sys/arch/sun3/dev/xd.c:1.70 --- src/sys/arch/sun3/dev/xd.c:1.69 Sun Mar 16 05:20:26 2014 +++ src/sys/arch/sun3/dev/xd.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: xd.c,v 1.69 2014/03/16 05:20:26 dholland Exp $ */ +/* $NetBSD: xd.c,v 1.70 2014/07/25 08:02:18 dholland Exp $ */ /* * Copyright (c) 1995 Charles D. Cranor @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.69 2014/03/16 05:20:26 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.70 2014/07/25 08:02:18 dholland Exp $"); #undef XDC_DEBUG /* full debug */ #define XDC_DIAG /* extra sanity checks */ @@ -292,6 +292,7 @@ const struct bdevsw xd_bdevsw = { .d_ioctl = xdioctl, .d_dump = xddump, .d_psize = xdsize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/sun3/dev/xy.c diff -u src/sys/arch/sun3/dev/xy.c:1.74 src/sys/arch/sun3/dev/xy.c:1.75 --- src/sys/arch/sun3/dev/xy.c:1.74 Sun Mar 16 05:20:26 2014 +++ src/sys/arch/sun3/dev/xy.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: xy.c,v 1.74 2014/03/16 05:20:26 dholland Exp $ */ +/* $NetBSD: xy.c,v 1.75 2014/07/25 08:02:18 dholland Exp $ */ /* * Copyright (c) 1995 Charles D. Cranor @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.74 2014/03/16 05:20:26 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.75 2014/07/25 08:02:18 dholland Exp $"); #undef XYC_DEBUG /* full debug */ #undef XYC_DIAG /* extra sanity checks */ @@ -223,6 +223,7 @@ const struct bdevsw xy_bdevsw = { .d_ioctl = xyioctl, .d_dump = xydump, .d_psize = xysize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/vax/mba/hp.c diff -u src/sys/arch/vax/mba/hp.c:1.48 src/sys/arch/vax/mba/hp.c:1.49 --- src/sys/arch/vax/mba/hp.c:1.48 Tue Dec 14 23:38:30 2010 +++ src/sys/arch/vax/mba/hp.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: hp.c,v 1.48 2010/12/14 23:38:30 matt Exp $ */ +/* $NetBSD: hp.c,v 1.49 2014/07/25 08:02:18 dholland Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.48 2010/12/14 23:38:30 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.49 2014/07/25 08:02:18 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -101,6 +101,7 @@ const struct bdevsw hp_bdevsw = { .d_ioctl = hpioctl, .d_dump = nulldump, .d_psize = hppsize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/vax/vax/ctu.c diff -u src/sys/arch/vax/vax/ctu.c:1.32 src/sys/arch/vax/vax/ctu.c:1.33 --- src/sys/arch/vax/vax/ctu.c:1.32 Sun Mar 16 05:20:26 2014 +++ src/sys/arch/vax/vax/ctu.c Fri Jul 25 08:02:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ctu.c,v 1.32 2014/03/16 05:20:26 dholland Exp $ */ +/* $NetBSD: ctu.c,v 1.33 2014/07/25 08:02:18 dholland Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ctu.c,v 1.32 2014/03/16 05:20:26 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ctu.c,v 1.33 2014/07/25 08:02:18 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -105,6 +105,7 @@ const struct bdevsw ctu_bdevsw = { .d_ioctl = noioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_TAPE }; Index: src/sys/arch/vax/vsa/hdc9224.c diff -u src/sys/arch/vax/vsa/hdc9224.c:1.52 src/sys/arch/vax/vsa/hdc9224.c:1.53 --- src/sys/arch/vax/vsa/hdc9224.c:1.52 Fri Oct 25 14:44:25 2013 +++ src/sys/arch/vax/vsa/hdc9224.c Fri Jul 25 08:02:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: hdc9224.c,v 1.52 2013/10/25 14:44:25 martin Exp $ */ +/* $NetBSD: hdc9224.c,v 1.53 2014/07/25 08:02:19 dholland Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -51,7 +51,7 @@ #undef RDDEBUG #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.52 2013/10/25 14:44:25 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.53 2014/07/25 08:02:19 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -201,6 +201,7 @@ const struct bdevsw rd_bdevsw = { .d_ioctl = rdioctl, .d_dump = nulldump, .d_psize = rdpsize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/x68k/dev/bmd.c diff -u src/sys/arch/x68k/dev/bmd.c:1.19 src/sys/arch/x68k/dev/bmd.c:1.20 --- src/sys/arch/x68k/dev/bmd.c:1.19 Sun Mar 16 05:20:26 2014 +++ src/sys/arch/x68k/dev/bmd.c Fri Jul 25 08:02:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: bmd.c,v 1.19 2014/03/16 05:20:26 dholland Exp $ */ +/* $NetBSD: bmd.c,v 1.20 2014/07/25 08:02:19 dholland Exp $ */ /* * Copyright (c) 2002 Tetsuya Isaki. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.19 2014/03/16 05:20:26 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.20 2014/07/25 08:02:19 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -112,6 +112,7 @@ const struct bdevsw bmd_bdevsw = { .d_ioctl = bmdioctl, .d_dump = bmddump, .d_psize = bmdsize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/x68k/dev/fd.c diff -u src/sys/arch/x68k/dev/fd.c:1.108 src/sys/arch/x68k/dev/fd.c:1.109 --- src/sys/arch/x68k/dev/fd.c:1.108 Wed Mar 26 08:17:59 2014 +++ src/sys/arch/x68k/dev/fd.c Fri Jul 25 08:02:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.108 2014/03/26 08:17:59 christos Exp $ */ +/* $NetBSD: fd.c,v 1.109 2014/07/25 08:02:19 dholland Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.108 2014/03/26 08:17:59 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.109 2014/07/25 08:02:19 dholland Exp $"); #include "opt_ddb.h" #include "opt_m68k_arch.h" @@ -277,6 +277,7 @@ const struct bdevsw fd_bdevsw = { .d_ioctl = fdioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/arch/xen/xen/xbd_xenbus.c diff -u src/sys/arch/xen/xen/xbd_xenbus.c:1.63 src/sys/arch/xen/xen/xbd_xenbus.c:1.64 --- src/sys/arch/xen/xen/xbd_xenbus.c:1.63 Sun May 25 19:23:49 2014 +++ src/sys/arch/xen/xen/xbd_xenbus.c Fri Jul 25 08:02:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: xbd_xenbus.c,v 1.63 2014/05/25 19:23:49 bouyer Exp $ */ +/* $NetBSD: xbd_xenbus.c,v 1.64 2014/07/25 08:02:19 dholland Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.63 2014/05/25 19:23:49 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.64 2014/07/25 08:02:19 dholland Exp $"); #include "opt_xen.h" @@ -197,6 +197,7 @@ const struct bdevsw xbd_bdevsw = { .d_ioctl = xbdioctl, .d_dump = xbddump, .d_psize = xbdsize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/dev/ccd.c diff -u src/sys/dev/ccd.c:1.149 src/sys/dev/ccd.c:1.150 --- src/sys/dev/ccd.c:1.149 Sat Jun 14 07:39:00 2014 +++ src/sys/dev/ccd.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/cgd.c diff -u src/sys/dev/cgd.c:1.88 src/sys/dev/cgd.c:1.89 --- src/sys/dev/cgd.c:1.88 Sat Jun 14 07:39:00 2014 +++ src/sys/dev/cgd.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/fss.c diff -u src/sys/dev/fss.c:1.89 src/sys/dev/fss.c:1.90 --- src/sys/dev/fss.c:1.89 Sun May 25 13:52:12 2014 +++ src/sys/dev/fss.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/ld.c diff -u src/sys/dev/ld.c:1.72 src/sys/dev/ld.c:1.73 --- src/sys/dev/ld.c:1.72 Sun Mar 16 05:20:26 2014 +++ src/sys/dev/ld.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/md.c diff -u src/sys/dev/md.c:1.69 src/sys/dev/md.c:1.70 --- src/sys/dev/md.c:1.69 Sun Mar 16 05:20:26 2014 +++ src/sys/dev/md.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/vnd.c diff -u src/sys/dev/vnd.c:1.230 src/sys/dev/vnd.c:1.231 --- src/sys/dev/vnd.c:1.230 Tue Jul 22 13:32:59 2014 +++ src/sys/dev/vnd.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/altmem/altmem.c diff -u src/sys/dev/altmem/altmem.c:1.2 src/sys/dev/altmem/altmem.c:1.3 --- src/sys/dev/altmem/altmem.c:1.2 Sun Mar 16 05:20:26 2014 +++ src/sys/dev/altmem/altmem.c Fri Jul 25 08:02:19 2014 @@ -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 <jmcne...@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 = { Index: src/sys/dev/ata/wd.c diff -u src/sys/dev/ata/wd.c:1.407 src/sys/dev/ata/wd.c:1.408 --- src/sys/dev/ata/wd.c:1.407 Sun Mar 16 05:20:27 2014 +++ src/sys/dev/ata/wd.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/dkwedge/dk.c diff -u src/sys/dev/dkwedge/dk.c:1.69 src/sys/dev/dkwedge/dk.c:1.70 --- src/sys/dev/dkwedge/dk.c:1.69 Thu Apr 3 15:24:20 2014 +++ src/sys/dev/dkwedge/dk.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/dm/device-mapper.c diff -u src/sys/dev/dm/device-mapper.c:1.32 src/sys/dev/dm/device-mapper.c:1.33 --- src/sys/dev/dm/device-mapper.c:1.32 Sat Dec 28 19:25:07 2013 +++ src/sys/dev/dm/device-mapper.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/flash/flash.c diff -u src/sys/dev/flash/flash.c:1.10 src/sys/dev/flash/flash.c:1.11 --- src/sys/dev/flash/flash.c:1.10 Fri Sep 13 22:18:42 2013 +++ src/sys/dev/flash/flash.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/gpib/ct.c diff -u src/sys/dev/gpib/ct.c:1.25 src/sys/dev/gpib/ct.c:1.26 --- src/sys/dev/gpib/ct.c:1.25 Sun Mar 16 05:20:27 2014 +++ src/sys/dev/gpib/ct.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/gpib/mt.c diff -u src/sys/dev/gpib/mt.c:1.27 src/sys/dev/gpib/mt.c:1.28 --- src/sys/dev/gpib/mt.c:1.27 Sun Mar 23 02:57:20 2014 +++ src/sys/dev/gpib/mt.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/gpib/rd.c diff -u src/sys/dev/gpib/rd.c:1.33 src/sys/dev/gpib/rd.c:1.34 --- src/sys/dev/gpib/rd.c:1.33 Sun Mar 23 03:41:10 2014 +++ src/sys/dev/gpib/rd.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/ieee1394/fwdev.c diff -u src/sys/dev/ieee1394/fwdev.c:1.28 src/sys/dev/ieee1394/fwdev.c:1.29 --- src/sys/dev/ieee1394/fwdev.c:1.28 Sun Mar 16 05:20:28 2014 +++ src/sys/dev/ieee1394/fwdev.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/isa/fd.c diff -u src/sys/dev/isa/fd.c:1.102 src/sys/dev/isa/fd.c:1.103 --- src/sys/dev/isa/fd.c:1.102 Sun Mar 16 05:20:28 2014 +++ src/sys/dev/isa/fd.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/isa/mcd.c diff -u src/sys/dev/isa/mcd.c:1.111 src/sys/dev/isa/mcd.c:1.112 --- src/sys/dev/isa/mcd.c:1.111 Sun Mar 16 05:20:28 2014 +++ src/sys/dev/isa/mcd.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/isa/wt.c diff -u src/sys/dev/isa/wt.c:1.84 src/sys/dev/isa/wt.c:1.85 --- src/sys/dev/isa/wt.c:1.84 Sun Mar 16 05:20:28 2014 +++ src/sys/dev/isa/wt.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/mca/ed_mca.c diff -u src/sys/dev/mca/ed_mca.c:1.55 src/sys/dev/mca/ed_mca.c:1.56 --- src/sys/dev/mca/ed_mca.c:1.55 Thu Mar 20 06:48:54 2014 +++ src/sys/dev/mca/ed_mca.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/mscp/mscp_disk.c diff -u src/sys/dev/mscp/mscp_disk.c:1.79 src/sys/dev/mscp/mscp_disk.c:1.80 --- src/sys/dev/mscp/mscp_disk.c:1.79 Sun Mar 16 05:49:41 2014 +++ src/sys/dev/mscp/mscp_disk.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/mscp/mscp_tape.c diff -u src/sys/dev/mscp/mscp_tape.c:1.41 src/sys/dev/mscp/mscp_tape.c:1.42 --- src/sys/dev/mscp/mscp_tape.c:1.41 Sun Mar 16 05:20:28 2014 +++ src/sys/dev/mscp/mscp_tape.c Fri Jul 25 08:02:19 2014 @@ -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 }; Index: src/sys/dev/ofw/ofdisk.c diff -u src/sys/dev/ofw/ofdisk.c:1.45 src/sys/dev/ofw/ofdisk.c:1.46 --- src/sys/dev/ofw/ofdisk.c:1.45 Sun Mar 16 05:20:28 2014 +++ src/sys/dev/ofw/ofdisk.c Fri Jul 25 08:02:20 2014 @@ -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 }; Index: src/sys/dev/qbus/rf.c diff -u src/sys/dev/qbus/rf.c:1.26 src/sys/dev/qbus/rf.c:1.27 --- src/sys/dev/qbus/rf.c:1.26 Sun Mar 16 05:20:29 2014 +++ src/sys/dev/qbus/rf.c Fri Jul 25 08:02:20 2014 @@ -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 }; Index: src/sys/dev/qbus/rl.c diff -u src/sys/dev/qbus/rl.c:1.43 src/sys/dev/qbus/rl.c:1.44 --- src/sys/dev/qbus/rl.c:1.43 Sun Mar 16 05:20:29 2014 +++ src/sys/dev/qbus/rl.c Fri Jul 25 08:02:20 2014 @@ -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 }; Index: src/sys/dev/qbus/ts.c diff -u src/sys/dev/qbus/ts.c:1.29 src/sys/dev/qbus/ts.c:1.30 --- src/sys/dev/qbus/ts.c:1.29 Sun Mar 16 05:20:29 2014 +++ src/sys/dev/qbus/ts.c Fri Jul 25 08:02:20 2014 @@ -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 }; Index: src/sys/dev/raidframe/rf_netbsdkintf.c diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.310 src/sys/dev/raidframe/rf_netbsdkintf.c:1.311 --- src/sys/dev/raidframe/rf_netbsdkintf.c:1.310 Mon May 12 15:53:01 2014 +++ src/sys/dev/raidframe/rf_netbsdkintf.c Fri Jul 25 08:02:20 2014 @@ -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 }; Index: src/sys/dev/scsipi/cd.c diff -u src/sys/dev/scsipi/cd.c:1.320 src/sys/dev/scsipi/cd.c:1.321 --- src/sys/dev/scsipi/cd.c:1.320 Sat Jul 12 12:13:01 2014 +++ src/sys/dev/scsipi/cd.c Fri Jul 25 08:02:20 2014 @@ -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 }; Index: src/sys/dev/scsipi/sd.c diff -u src/sys/dev/scsipi/sd.c:1.305 src/sys/dev/scsipi/sd.c:1.306 --- src/sys/dev/scsipi/sd.c:1.305 Sun Mar 16 05:20:29 2014 +++ src/sys/dev/scsipi/sd.c Fri Jul 25 08:02:20 2014 @@ -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 }; Index: src/sys/dev/scsipi/st.c diff -u src/sys/dev/scsipi/st.c:1.223 src/sys/dev/scsipi/st.c:1.224 --- src/sys/dev/scsipi/st.c:1.223 Sun Mar 16 05:20:29 2014 +++ src/sys/dev/scsipi/st.c Fri Jul 25 08:02:20 2014 @@ -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 }; Index: src/sys/dev/spi/spiflash.c diff -u src/sys/dev/spi/spiflash.c:1.13 src/sys/dev/spi/spiflash.c:1.14 --- src/sys/dev/spi/spiflash.c:1.13 Fri Mar 28 11:52:51 2014 +++ src/sys/dev/spi/spiflash.c Fri Jul 25 08:02:20 2014 @@ -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, }; Index: src/sys/dev/vme/xd.c diff -u src/sys/dev/vme/xd.c:1.91 src/sys/dev/vme/xd.c:1.92 --- src/sys/dev/vme/xd.c:1.91 Sun Mar 16 05:20:29 2014 +++ src/sys/dev/vme/xd.c Fri Jul 25 08:02:20 2014 @@ -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 }; Index: src/sys/dev/vme/xy.c diff -u src/sys/dev/vme/xy.c:1.95 src/sys/dev/vme/xy.c:1.96 --- src/sys/dev/vme/xy.c:1.95 Sun Mar 16 05:20:29 2014 +++ src/sys/dev/vme/xy.c Fri Jul 25 08:02:20 2014 @@ -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 }; Index: src/sys/rump/librump/rumpvfs/rumpblk.c diff -u src/sys/rump/librump/rumpvfs/rumpblk.c:1.55 src/sys/rump/librump/rumpvfs/rumpblk.c:1.56 --- src/sys/rump/librump/rumpvfs/rumpblk.c:1.55 Sun Mar 16 05:20:30 2014 +++ src/sys/rump/librump/rumpvfs/rumpblk.c Fri Jul 25 08:02:20 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpblk.c,v 1.55 2014/03/16 05:20:30 dholland Exp $ */ +/* $NetBSD: rumpblk.c,v 1.56 2014/07/25 08:02:20 dholland Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.55 2014/03/16 05:20:30 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.56 2014/07/25 08:02:20 dholland Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -101,6 +101,7 @@ static const struct bdevsw rumpblk_bdevs .d_ioctl = rumpblk_ioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; @@ -111,6 +112,7 @@ static const struct bdevsw rumpblk_bdevs .d_ioctl = rumpblk_ioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_DISK }; Index: src/sys/uvm/uvm_swap.c diff -u src/sys/uvm/uvm_swap.c:1.170 src/sys/uvm/uvm_swap.c:1.171 --- src/sys/uvm/uvm_swap.c:1.170 Sat Jun 28 15:52:45 2014 +++ src/sys/uvm/uvm_swap.c Fri Jul 25 08:02:20 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_swap.c,v 1.170 2014/06/28 15:52:45 maxv Exp $ */ +/* $NetBSD: uvm_swap.c,v 1.171 2014/07/25 08:02:20 dholland Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.170 2014/06/28 15:52:45 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.171 2014/07/25 08:02:20 dholland Exp $"); #include "opt_uvmhist.h" #include "opt_compat_netbsd.h" @@ -1286,6 +1286,7 @@ const struct bdevsw swap_bdevsw = { .d_ioctl = noioctl, .d_dump = nodump, .d_psize = nosize, + .d_discard = nodiscard, .d_flag = D_OTHER };