From owner-svn-src-head@freebsd.org Mon Feb 10 14:27:30 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CDBE023BB77; Mon, 10 Feb 2020 14:27:30 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48GSst3sqWz4Y9S; Mon, 10 Feb 2020 14:27:30 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 801C7206E8; Mon, 10 Feb 2020 14:27:30 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01AERUgK057588; Mon, 10 Feb 2020 14:27:30 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01AERTo0057581; Mon, 10 Feb 2020 14:27:29 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <202002101427.01AERTo0057581@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Mon, 10 Feb 2020 14:27:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357730 - in head/sys: cam/ata cam/nvme cam/scsi ufs/ffs ufs/ufs X-SVN-Group: head X-SVN-Commit-Author: scottl X-SVN-Commit-Paths: in head/sys: cam/ata cam/nvme cam/scsi ufs/ffs ufs/ufs X-SVN-Commit-Revision: 357730 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2020 14:27:30 -0000 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 #include #include -#include #include #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 #include #include -#include #include #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