Module Name: src
Committed By: martin
Date: Mon Apr 6 14:53:33 UTC 2020
Modified Files:
src/sys/dev/dkwedge [netbsd-9]: dk.c
Log Message:
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!)
To generate a diff of this commit:
cvs rdiff -u -r1.97.8.1 -r1.97.8.2 src/sys/dev/dkwedge/dk.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/dev/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.97.8.1 src/sys/dev/dkwedge/dk.c:1.97.8.2
--- src/sys/dev/dkwedge/dk.c:1.97.8.1 Sat Mar 21 15:18:57 2020
+++ src/sys/dev/dkwedge/dk.c Mon Apr 6 14:53:33 2020
@@ -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 @@ dkdump(dev_t dev, daddr_t blkno, void *v
/* 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;
}
