Module Name: src
Committed By: martin
Date: Sat Mar 21 16:00:39 UTC 2020
Modified Files:
src/sys/dev [netbsd-9]: dksubr.c dkvar.h
Log Message:
Apply patch, requested by riastradh in ticket #795, to keep ABI compatibility.
To generate a diff of this commit:
cvs rdiff -u -r1.109.2.1 -r1.109.2.2 src/sys/dev/dksubr.c
cvs rdiff -u -r1.30.10.1 -r1.30.10.2 src/sys/dev/dkvar.h
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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.109.2.1 src/sys/dev/dksubr.c:1.109.2.2
--- src/sys/dev/dksubr.c:1.109.2.1 Sat Mar 21 15:52:09 2020
+++ src/sys/dev/dksubr.c Sat Mar 21 16:00:39 2020
@@ -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 @@ dk_ioctl(struct dk_softc *dksc, dev_t de
#define DKFF_READYFORDUMP(x) (((x) & DKF_READYFORDUMP) == DKF_READYFORDUMP)
static volatile int dk_dumping = 0;
-/* ARGSUSED */
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_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;
Index: src/sys/dev/dkvar.h
diff -u src/sys/dev/dkvar.h:1.30.10.1 src/sys/dev/dkvar.h:1.30.10.2
--- src/sys/dev/dkvar.h:1.30.10.1 Sat Mar 21 15:52:09 2020
+++ src/sys/dev/dkvar.h Sat Mar 21 16:00:39 2020
@@ -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_size(struct dk_softc *, dev_t);
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_ */
