[src/netbsd-9]: src/sys/dev/dkwedge Pull up following revision(s) (requested ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3c42352794d5
branches:  netbsd-9
changeset: 963766:3c42352794d5
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Apr 06 14:53:33 2020 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #822):

        sys/dev/dkwedge/dk.c: revision 1.99

Allow dumping to cgd(4) on a dk(4).

(Technically this also allows dumping to a dk(4) on which there
happens to be a cgd(4) configured, but I'm not sure how to
distinguish that case here.  So don't do that!)

diffstat:

 sys/dev/dkwedge/dk.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 09b47dc7344f -r 3c42352794d5 sys/dev/dkwedge/dk.c
--- a/sys/dev/dkwedge/dk.c      Mon Apr 06 14:44:15 2020 +0000
+++ b/sys/dev/dkwedge/dk.c      Mon Apr 06 14:53:33 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dk.c,v 1.97.8.1 2020/03/21 15:18:57 martin Exp $       */
+/*     $NetBSD: dk.c,v 1.97.8.2 2020/04/06 14:53:33 martin 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.97.8.1 2020/03/21 15:18:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.97.8.2 2020/04/06 14:53:33 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dkwedge.h"
@@ -1622,7 +1622,8 @@
        /* Our content type is static, no need to open the device. */
 
        if (strcmp(sc->sc_ptype, DKW_PTYPE_SWAP) != 0 &&
-           strcmp(sc->sc_ptype, DKW_PTYPE_RAID) != 0) {
+           strcmp(sc->sc_ptype, DKW_PTYPE_RAID) != 0 &&
+           strcmp(sc->sc_ptype, DKW_PTYPE_CGD) != 0) {
                rv = ENXIO;
                goto out;
        }