[src/netbsd-9]: src/sys/dev Apply patch, requested by riastradh in ticket #79...

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

details:   https://anonhg.NetBSD.org/src/rev/f140e237ce31
branches:  netbsd-9
changeset: 843987:f140e237ce31
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Mar 21 16:00:39 2020 +0000

description:
Apply patch, requested by riastradh in ticket #795, to keep ABI compatibility.

diffstat:

 sys/dev/dksubr.c |  16 +++++++++++++---
 sys/dev/dkvar.h  |   8 +++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diffs (65 lines):

diff -r 6df52325b09c -r f140e237ce31 sys/dev/dksubr.c
--- a/sys/dev/dksubr.c  Sat Mar 21 15:52:09 2020 +0000
+++ b/sys/dev/dksubr.c  Sat Mar 21 16:00:39 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.109.2.1 2020/03/21 15:52:09 martin Exp $ */
+/* $NetBSD: dksubr.c,v 1.109.2.2 2020/03/21 16:00:39 martin Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.109.2.1 2020/03/21 15:52:09 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.109.2.2 2020/03/21 16:00:39 martin Exp $");
+
+#define        _DKSUBR_PRIVATE
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -758,9 +760,17 @@
 #define DKFF_READYFORDUMP(x)   (((x) & DKF_READYFORDUMP) == DKF_READYFORDUMP)
 static volatile int    dk_dumping = 0;
 
+int
+dk_dump(struct dk_softc *dksc, dev_t dev,
+    daddr_t blkno, void *vav, size_t size)
+{
+
+       return dk_dump_flags(dksc, dev, blkno, vav, size, 0);
+}
+
 /* ARGSUSED */
 int
-dk_dump(struct dk_softc *dksc, dev_t dev,
+dk_dump_flags(struct dk_softc *dksc, dev_t dev,
     daddr_t blkno, void *vav, size_t size, int flags)
 {
        const struct dkdriver *dkd = dksc->sc_dkdev.dk_driver;
diff -r 6df52325b09c -r f140e237ce31 sys/dev/dkvar.h
--- a/sys/dev/dkvar.h   Sat Mar 21 15:52:09 2020 +0000
+++ b/sys/dev/dkvar.h   Sat Mar 21 16:00:39 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dkvar.h,v 1.30.10.1 2020/03/21 15:52:09 martin Exp $ */
+/* $NetBSD: dkvar.h,v 1.30.10.2 2020/03/21 16:00:39 martin Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -108,10 +108,16 @@
 int    dk_ioctl(struct dk_softc *, dev_t,
                 u_long, void *, int, struct lwp *);
 int    dk_dump(struct dk_softc *, dev_t,
+               daddr_t, void *, size_t);
+int    dk_dump_flags(struct dk_softc *, dev_t,
                daddr_t, void *, size_t, int);
 void   dk_getdisklabel(struct dk_softc *, dev_t);
 void   dk_getdefaultlabel(struct dk_softc *, struct disklabel *);
 
 int    dk_lookup(struct pathbuf *, struct lwp *, struct vnode **);
 
+#ifndef _DKSUBR_PRIVATE
+#define        dk_dump dk_dump_flags
+#endif
+
 #endif /* ! _DEV_DKVAR_H_ */