kerneldump: remove physical argument from d_dumper

The physical address argument is essentially ignored by every dumper
method. In addition, the dump routines don't actually pass a real
address; every call to dump_append() passes a value of zero for
physical.

Reviewed by:	markj
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D35173

10 files changed, 26 insertions, 32 deletions

diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c
index 5e383cd35733..57208a0744db 100644
--- a/sys/geom/nop/g_nop.c
+++ b/sys/geom/nop/g_nop.c
@@ -130,8 +130,7 @@ g_nop_resize(struct g_consumer *cp)
 }
 
 static int
-g_nop_dumper(void *priv, void *virtual, vm_offset_t physical, off_t offset,
-    size_t length)
+g_nop_dumper(void *priv, void *virtual, off_t offset, size_t length)
 {
 
 	return (0);
diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c
index fc5852d28fd7..561ac5b45e42 100644
--- a/sys/geom/raid/g_raid.c
+++ b/sys/geom/raid/g_raid.c
@@ -1033,8 +1033,7 @@ g_raid_tr_kerneldump_common(struct g_raid_tr_object *tr,
 }
 
 static int
-g_raid_dump(void *arg,
-    void *virtual, vm_offset_t physical, off_t offset, size_t length)
+g_raid_dump(void *arg, void *virtual, off_t offset, size_t length)
 {
 	struct g_raid_volume *vol;
 	int error;
@@ -1043,8 +1042,7 @@ g_raid_dump(void *arg,
 	G_RAID_DEBUG1(3, vol->v_softc, "Dumping at off %llu len %llu.",
 	    (long long unsigned)offset, (long long unsigned)length);
 
-	error = G_RAID_TR_KERNELDUMP(vol->v_tr,
-	    virtual, physical, offset, length);
+	error = G_RAID_TR_KERNELDUMP(vol->v_tr, virtual, offset, length);
 	return (error);
 }
 
@@ -1397,7 +1395,7 @@ nodisk:
 		G_RAID_LOGREQ(3, bp, "Sending dumping request.");
 		if (bp->bio_cmd == BIO_WRITE) {
 			bp->bio_error = g_raid_subdisk_kerneldump(sd,
-			    bp->bio_data, 0, bp->bio_offset, bp->bio_length);
+			    bp->bio_data, bp->bio_offset, bp->bio_length);
 		} else
 			bp->bio_error = EOPNOTSUPP;
 		g_raid_disk_done(bp);
@@ -1410,8 +1408,8 @@ nodisk:
 }
 
 int
-g_raid_subdisk_kerneldump(struct g_raid_subdisk *sd,
-    void *virtual, vm_offset_t physical, off_t offset, size_t length)
+g_raid_subdisk_kerneldump(struct g_raid_subdisk *sd, void *virtual,
+    off_t offset, size_t length)
 {
 
 	if (sd->sd_disk == NULL)
@@ -1419,7 +1417,7 @@ g_raid_subdisk_kerneldump(struct g_raid_subdisk *sd,
 	if (sd->sd_disk->d_kd.di.dumper == NULL)
 		return (EOPNOTSUPP);
 	return (dump_write(&sd->sd_disk->d_kd.di,
-	    virtual, physical,
+	    virtual, 0,
 	    sd->sd_disk->d_kd.di.mediaoffset + sd->sd_offset + offset,
 	    length));
 }
diff --git a/sys/geom/raid/g_raid.h b/sys/geom/raid/g_raid.h
index eeaa8ac32508..720d588d9118 100644
--- a/sys/geom/raid/g_raid.h
+++ b/sys/geom/raid/g_raid.h
@@ -406,8 +406,8 @@ int g_raid_destroy_disk(struct g_raid_disk *disk);
 
 void g_raid_iodone(struct bio *bp, int error);
 void g_raid_subdisk_iostart(struct g_raid_subdisk *sd, struct bio *bp);
-int g_raid_subdisk_kerneldump(struct g_raid_subdisk *sd,
-    void *virtual, vm_offset_t physical, off_t offset, size_t length);
+int g_raid_subdisk_kerneldump(struct g_raid_subdisk *sd, void *virtual,
+    off_t offset, size_t length);
 
 struct g_consumer *g_raid_open_consumer(struct g_raid_softc *sc,
     const char *name);
diff --git a/sys/geom/raid/g_raid_tr_if.m b/sys/geom/raid/g_raid_tr_if.m
index 193b4298691a..8de09ba1eb56 100644
--- a/sys/geom/raid/g_raid_tr_if.m
+++ b/sys/geom/raid/g_raid_tr_if.m
@@ -95,7 +95,6 @@ METHOD void iodone {
 METHOD int kerneldump {
 	struct g_raid_tr_object *tr;
 	void *virtual;
-	vm_offset_t physical;
 	off_t offset;
 	size_t length;
 } DEFAULT g_raid_tr_kerneldump_common;
diff --git a/sys/geom/raid/tr_concat.c b/sys/geom/raid/tr_concat.c
index dca728bf6dc4..a0a69502206f 100644
--- a/sys/geom/raid/tr_concat.c
+++ b/sys/geom/raid/tr_concat.c
@@ -286,8 +286,8 @@ failure:
 }
 
 static int
-g_raid_tr_kerneldump_concat(struct g_raid_tr_object *tr,
-    void *virtual, vm_offset_t physical, off_t boffset, size_t blength)
+g_raid_tr_kerneldump_concat(struct g_raid_tr_object *tr, void *virtual,
+    off_t boffset, size_t blength)
 {
 	struct g_raid_volume *vol;
 	struct g_raid_subdisk *sd;
@@ -314,7 +314,7 @@ g_raid_tr_kerneldump_concat(struct g_raid_tr_object *tr,
 		sd = &vol->v_subdisks[no];
 		length = MIN(sd->sd_size - offset, remain);
 		error = g_raid_subdisk_kerneldump(&vol->v_subdisks[no],
-		    addr, 0, offset, length);
+		    addr, offset, length);
 		if (error != 0)
 			return (error);
 		remain -= length;
diff --git a/sys/geom/raid/tr_raid0.c b/sys/geom/raid/tr_raid0.c
index 22e2d6e1edda..43782a0956a2 100644
--- a/sys/geom/raid/tr_raid0.c
+++ b/sys/geom/raid/tr_raid0.c
@@ -269,7 +269,7 @@ failure:
 
 static int
 g_raid_tr_kerneldump_raid0(struct g_raid_tr_object *tr,
-    void *virtual, vm_offset_t physical, off_t boffset, size_t blength)
+    void *virtual, off_t boffset, size_t blength)
 {
 	struct g_raid_volume *vol;
 	char *addr;
@@ -296,8 +296,8 @@ g_raid_tr_kerneldump_raid0(struct g_raid_tr_object *tr,
 
 	do {
 		length = MIN(strip_size - start, remain);
-		error = g_raid_subdisk_kerneldump(&vol->v_subdisks[no],
-		    addr, 0, offset + start, length);
+		error = g_raid_subdisk_kerneldump(&vol->v_subdisks[no], addr,
+		    offset + start, length);
 		if (error != 0)
 			return (error);
 		if (++no >= vol->v_disks_count) {
diff --git a/sys/geom/raid/tr_raid1.c b/sys/geom/raid/tr_raid1.c
index 63bea0945c9c..7a6f76a3137d 100644
--- a/sys/geom/raid/tr_raid1.c
+++ b/sys/geom/raid/tr_raid1.c
@@ -899,8 +899,8 @@ rebuild_round_done:
 }
 
 static int
-g_raid_tr_kerneldump_raid1(struct g_raid_tr_object *tr,
-    void *virtual, vm_offset_t physical, off_t offset, size_t length)
+g_raid_tr_kerneldump_raid1(struct g_raid_tr_object *tr, void *virtual,
+    off_t offset, size_t length)
 {
 	struct g_raid_volume *vol;
 	struct g_raid_subdisk *sd;
@@ -935,8 +935,7 @@ g_raid_tr_kerneldump_raid1(struct g_raid_tr_object *tr,
 		default:
 			continue;
 		}
-		error = g_raid_subdisk_kerneldump(sd,
-		    virtual, physical, offset, length);
+		error = g_raid_subdisk_kerneldump(sd, virtual, offset, length);
 		if (error == 0)
 			ok++;
 	}
diff --git a/sys/geom/raid/tr_raid1e.c b/sys/geom/raid/tr_raid1e.c
index 45a48acfd3b2..937d5ee8bb08 100644
--- a/sys/geom/raid/tr_raid1e.c
+++ b/sys/geom/raid/tr_raid1e.c
@@ -1144,8 +1144,8 @@ rebuild_round_done:
 }
 
 static int
-g_raid_tr_kerneldump_raid1e(struct g_raid_tr_object *tr,
-    void *virtual, vm_offset_t physical, off_t boffset, size_t blength)
+g_raid_tr_kerneldump_raid1e(struct g_raid_tr_object *tr, void *virtual,
+    off_t boffset, size_t blength)
 {
 	struct g_raid_volume *vol;
 	struct g_raid_subdisk *sd;
@@ -1177,8 +1177,8 @@ g_raid_tr_kerneldump_raid1e(struct g_raid_tr_object *tr,
 			default:
 				goto nextdisk;
 			}
-			error = g_raid_subdisk_kerneldump(sd,
-			    addr, 0, offset + start, length);
+			error = g_raid_subdisk_kerneldump(sd, addr,
+			    offset + start, length);
 			if (error != 0)
 				return (error);
 nextdisk:
diff --git a/sys/geom/raid/tr_raid5.c b/sys/geom/raid/tr_raid5.c
index 431f9cad09de..5fa4edd49248 100644
--- a/sys/geom/raid/tr_raid5.c
+++ b/sys/geom/raid/tr_raid5.c
@@ -385,8 +385,8 @@ g_raid_tr_iodone_raid5(struct g_raid_tr_object *tr,
 }
 
 static int
-g_raid_tr_kerneldump_raid5(struct g_raid_tr_object *tr,
-    void *virtual, vm_offset_t physical, off_t offset, size_t length)
+g_raid_tr_kerneldump_raid5(struct g_raid_tr_object *tr, void *virtual,
+    off_t offset, size_t length)
 {
 
 	return (ENODEV);
diff --git a/sys/geom/union/g_union.c b/sys/geom/union/g_union.c
index 23f7eaac25a9..ddc0acf52b78 100644
--- a/sys/geom/union/g_union.c
+++ b/sys/geom/union/g_union.c
@@ -88,7 +88,7 @@ static bool g_union_getmap(struct bio *bp, struct g_union_softc *sc,
 	off_t *len2read);
 static void g_union_done(struct bio *bp);
 static void g_union_kerneldump(struct bio *bp, struct g_union_softc *sc);
-static int g_union_dumper(void *, void *, vm_offset_t, off_t, size_t);
+static int g_union_dumper(void *, void *, off_t, size_t);
 static int g_union_destroy(struct gctl_req *req, struct g_geom *gp, bool force);
 
 /*
@@ -1222,8 +1222,7 @@ g_union_kerneldump(struct bio *bp, struct g_union_softc *sc)
  * Handler for g_union_kerneldump().
  */
 static int
-g_union_dumper(void *priv, void *virtual, vm_offset_t physical, off_t offset,
-    size_t length)
+g_union_dumper(void *priv, void *virtual, off_t offset, size_t length)
 {
 
 	return (0);