Author: scottl
Date: Mon Feb 10 14:27:28 2020
New Revision: 357730
URL: https://svnweb.freebsd.org/changeset/base/357730
Log:
Revert r357710 and 357711 until they can be debugged
Modified:
head/sys/cam/ata/ata_da.c
head/sys/cam/nvme/nvme_da.c
head/sys/cam/scsi/scsi_da.c
head/sys/ufs/ffs/ffs_softdep.c
head/sys/ufs/ffs/ffs_vfsops.c
head/sys/ufs/ufs/ufsmount.h
Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c Mon Feb 10 13:54:34 2020 (r357729)
+++ head/sys/cam/ata/ata_da.c Mon Feb 10 14:27:28 2020 (r357730)
@@ -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 */
@@ -1566,10 +1565,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);
Modified: head/sys/cam/nvme/nvme_da.c
==============================================================================
--- head/sys/cam/nvme/nvme_da.c Mon Feb 10 13:54:34 2020 (r357729)
+++ head/sys/cam/nvme/nvme_da.c Mon Feb 10 14:27:28 2020 (r357730)
@@ -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 */
@@ -700,10 +699,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);
Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c Mon Feb 10 13:54:34 2020 (r357729)
+++ head/sys/cam/scsi/scsi_da.c Mon Feb 10 14:27:28 2020 (r357730)
@@ -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,
Modified: head/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- head/sys/ufs/ffs/ffs_softdep.c Mon Feb 10 13:54:34 2020
(r357729)
+++ head/sys/ufs/ffs/ffs_softdep.c Mon Feb 10 14:27:28 2020
(r357730)
@@ -1464,9 +1464,6 @@ softdep_send_speedup(struct ufsmount *ump, size_t shor
{
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;
Modified: head/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- head/sys/ufs/ffs/ffs_vfsops.c Mon Feb 10 13:54:34 2020
(r357729)
+++ head/sys/ufs/ffs/ffs_vfsops.c Mon Feb 10 14:27:28 2020
(r357730)
@@ -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;
@@ -1009,13 +1009,6 @@ ffs_mountfs(devvp, mp, td)
ump->um_trimhash = hashinit(MAXTRIMIO, M_TRIM,
&ump->um_trimlisthashsize);
}
- }
-
- /* 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;
Modified: head/sys/ufs/ufs/ufsmount.h
==============================================================================
--- head/sys/ufs/ufs/ufsmount.h Mon Feb 10 13:54:34 2020 (r357729)
+++ head/sys/ufs/ufs/ufsmount.h Mon Feb 10 14:27:28 2020 (r357730)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
