From dcebfcf3d46845addeaf971531cc6261a86dfc67 Mon Sep 17 00:00:00 2001
From: scottl <scottl@FreeBSD.org>
Date: Mon, 10 Feb 2020 14:27:28 +0000
Subject: [PATCH] Revert r357710 and 357711 until they can be debugged

---
 sys/cam/ata/ata_da.c      | 5 -----
 sys/cam/nvme/nvme_da.c    | 5 -----
 sys/cam/scsi/scsi_da.c    | 4 ----
 sys/ufs/ffs/ffs_softdep.c | 3 ---
 sys/ufs/ffs/ffs_vfsops.c  | 9 +--------
 sys/ufs/ufs/ufsmount.h    | 1 -
 6 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
index 4e906c5e571920..fd8bb6e427f62d 100644
--- a/sys/cam/ata/ata_da.c
+++ b/sys/cam/ata/ata_da.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/sbuf.h>
-#include <geom/geom.h>
 #include <geom/geom_disk.h>
 #endif /* _KERNEL */
 
@@ -1567,10 +1566,6 @@ adagetattr(struct bio *bp)
 	int ret;
 	struct cam_periph *periph;
 
-	/* TODO: tunable knob */
-	if (g_handleattr_int(bp, "GEOM::canspeedup", 1))
-		return (0);
-
 	periph = (struct cam_periph *)bp->bio_disk->d_drv1;
 	cam_periph_lock(periph);
 	ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c
index 4560df5c4c7fff..1af306206637dd 100644
--- a/sys/cam/nvme/nvme_da.c
+++ b/sys/cam/nvme/nvme_da.c
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/cons.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
-#include <geom/geom.h>
 #include <geom/geom_disk.h>
 #endif /* _KERNEL */
 
@@ -701,10 +700,6 @@ ndagetattr(struct bio *bp)
 	int ret;
 	struct cam_periph *periph;
 
-	/* TODO: tunable knob */
-	if (g_handleattr_int(bp, "GEOM::canspeedup", 1))
-		return (0);
-
 	periph = (struct cam_periph *)bp->bio_disk->d_drv1;
 	cam_periph_lock(periph);
 	ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 750aee2cf9c5a2..cadc438b60e023 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -1942,10 +1942,6 @@ dagetattr(struct bio *bp)
 	int ret;
 	struct cam_periph *periph;
 
-	/* TODO: tunable knob for this */
-	if (g_handleattr_int(bp, "GEOM::canspeedup", 1))
-		return (0);
-
 	periph = (struct cam_periph *)bp->bio_disk->d_drv1;
 	cam_periph_lock(periph);
 	ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 4e6ed2fe8d6419..8b88bf12c2a597 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1464,9 +1464,6 @@ softdep_send_speedup(struct ufsmount *ump, size_t shortage, u_int flags)
 {
 	struct buf *bp;
 
-	if ((ump->um_flags & UM_CANSPEEDUP) == 0)
-		return;
-
 	bp = malloc(sizeof(*bp), M_TRIM, M_WAITOK | M_ZERO);
 	bp->b_iocmd = BIO_SPEEDUP;
 	bp->b_ioflags = flags;
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index d276b30e24722f..d4c730fe20fef1 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -794,7 +794,7 @@ ffs_mountfs(devvp, mp, td)
 	struct ucred *cred;
 	struct g_consumer *cp;
 	struct mount *nmp;
-	int candelete, canspeedup;
+	int candelete;
 	off_t loc;
 
 	fs = NULL;
@@ -1011,13 +1011,6 @@ ffs_mountfs(devvp, mp, td)
 		}
 	}
 
-	/* TODO: sysctl tunables, runtime modification */
-	len = sizeof(int);
-	if (g_io_getattr("GEOM::canspeedup", cp, &len, &canspeedup) == 0) {
-		if (canspeedup)
-			ump->um_flags |= UM_CANSPEEDUP;
-	}
-
 	ump->um_mountp = mp;
 	ump->um_dev = dev;
 	ump->um_devvp = devvp;
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 493571442d6767..fd2d153ec759bb 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -131,7 +131,6 @@ struct ufsmount {
  */
 #define UM_CANDELETE		0x00000001	/* devvp supports TRIM */
 #define UM_WRITESUSPENDED	0x00000002	/* suspension in progress */
-#define UM_CANSPEEDUP		0x00000004	/* devvp supports SPEEDUP */
 
 /*
  * function prototypes