aboutsummaryrefslogtreecommitdiff
path: root/sys/cam
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2019-12-17 04:21:35 +0000
committerWarner Losh <imp@FreeBSD.org>2019-12-17 04:21:35 +0000
commit359e4dba07000029c8ae7f0c02ff97a92fbcd23b (patch)
tree234ca8d6f131afdec1271b6ffa829f2bc15afcf7 /sys/cam
parent79876290818fb97c43165a95f28e16a00c83de4f (diff)
downloadsrc-359e4dba07000029c8ae7f0c02ff97a92fbcd23b.tar.gz
src-359e4dba07000029c8ae7f0c02ff97a92fbcd23b.zip
Revert r355831
It wasn't supposed to change the defaults, but actually does. Back this out until that can be sorted out.
Notes
Notes: svn path=/head/; revision=355843
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/nvme/nvme_da.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c
index a7f8a1baaff6..b17983eff541 100644
--- a/sys/cam/nvme/nvme_da.c
+++ b/sys/cam/nvme/nvme_da.c
@@ -177,14 +177,6 @@ static int nda_max_trim_entries = NDA_MAX_TRIM_ENTRIES;
SYSCTL_INT(_kern_cam_nda, OID_AUTO, max_trim, CTLFLAG_RDTUN,
&nda_max_trim_entries, NDA_MAX_TRIM_ENTRIES,
"Maximum number of BIO_DELETE to send down as a DSM TRIM.");
-static int nda_goal_trim_entries = NDA_MAX_TRIM_ENTRIES / 2;
-SYSCTL_INT(_kern_cam_nda, OID_AUTO, goal_trim, CTLFLAG_RDTUN,
- &nda_goal_trim_entries, NDA_MAX_TRIM_ENTRIES / 2,
- "Number of BIO_DELETE to try to accumulate before sending a DSM TRIM.");
-static int nda_trim_ticks = 50; /* 50ms ~ 1000 Hz */
-SYSCTL_INT(_kern_cam_nda, OID_AUTO, trim_ticks, CTLFLAG_RDTUN,
- &nda_trim_ticks, 50,
- "Number of ticks to hold BIO_DELETEs before sending down a trim");
/*
* All NVMe media is non-rotational, so all nvme device instances
@@ -749,9 +741,6 @@ ndaregister(struct cam_periph *periph, void *arg)
free(softc, M_DEVBUF);
return(CAM_REQ_CMP_ERR);
}
- /* Statically set these for the moment */
- cam_iosched_set_trim_goal(softc->cam_iosched, nda_goal_trim_entries);
- cam_iosched_set_trim_ticks(softc->cam_iosched, nda_trim_ticks);
/* ident_data parsing */