summaryrefslogtreecommitdiff
path: root/sys/dev/ata
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2020-03-21 15:52:09 +0000
committermartin <martin@NetBSD.org>2020-03-21 15:52:09 +0000
commit4f2d73e6f81a404c140afe816619669c40c3dd41 (patch)
treefb99b371e50385b8b7e92c5151d7e9af7769a3a8 /sys/dev/ata
parent4414c647123430173c9d7f36453d0a63342a7658 (diff)
Pull up following revision(s) (requested by riastradh in ticket #795):
sys/dev/dksubr.c: revision 1.112 sys/arch/xen/xen/xbd_xenbus.c: revision 1.95 sys/dev/scsipi/sd.c: revision 1.328 sys/dev/dkvar.h: revision 1.32 sys/dev/ld.c: revision 1.109 sys/dev/cgd.c: revision 1.120 sys/dev/raidframe/rf_netbsdkintf.c: revision 1.380 sys/dev/ata/wd.c: revision 1.458 Add a flag to dk_dump for virtual disk devices. If a disk is backed by a physical medium other than itself, such as cgd(4), then it passes DK_DUMP_RECURSIVE to disable the recursion detection for dk_dump. If, however, a device represents a physical medium on its own, such as wd(4), then it passes 0 instead. With this, I can now dump to dk on cgd on dk on wd.
Diffstat (limited to 'sys/dev/ata')
-rw-r--r--sys/dev/ata/wd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index aa52d8a7425..4cc9fbe675a 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.452.2.1 2020/03/21 15:18:57 martin Exp $ */
+/* $NetBSD: wd.c,v 1.452.2.2 2020/03/21 15:52:09 martin 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.452.2.1 2020/03/21 15:18:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.452.2.2 2020/03/21 15:52:09 martin Exp $");
#include "opt_ata.h"
#include "opt_wd.h"
@@ -1570,7 +1570,7 @@ wddump(dev_t dev, daddr_t blkno, void *va, size_t size)
return (ENXIO);
dksc = &wd->sc_dksc;
- return dk_dump(dksc, dev, blkno, va, size);
+ return dk_dump(dksc, dev, blkno, va, size, 0);
}
static int