From owner-svn-src-all@freebsd.org  Fri Nov 29 06:25:04 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 15F941C4F93;
 Fri, 29 Nov 2019 06:25:04 +0000 (UTC)
 (envelope-from rlibby@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 47PPcv6hglz4Wym;
 Fri, 29 Nov 2019 06:25:03 +0000 (UTC)
 (envelope-from rlibby@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 C4E39A02B;
 Fri, 29 Nov 2019 06:25:03 +0000 (UTC)
 (envelope-from rlibby@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAT6P3nu017502;
 Fri, 29 Nov 2019 06:25:03 GMT (envelope-from rlibby@FreeBSD.org)
Received: (from rlibby@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAT6P3G0017501;
 Fri, 29 Nov 2019 06:25:03 GMT (envelope-from rlibby@FreeBSD.org)
Message-Id: <201911290625.xAT6P3G0017501@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rlibby set sender to
 rlibby@FreeBSD.org using -f
From: Ryan Libby <rlibby@FreeBSD.org>
Date: Fri, 29 Nov 2019 06:25:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r355207 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: rlibby
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 355207
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Nov 2019 06:25:04 -0000

Author: rlibby
Date: Fri Nov 29 06:25:03 2019
New Revision: 355207
URL: https://svnweb.freebsd.org/changeset/base/355207

Log:
  ktls_session zone: don't need to specify uma trash
  
  The use of the uma trash procedures is automatic, there's no need to
  pass them explicitly here.
  
  Reviewed by:	markj
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	https://reviews.freebsd.org/D22582

Modified:
  head/sys/kern/uipc_ktls.c

Modified: head/sys/kern/uipc_ktls.c
==============================================================================
--- head/sys/kern/uipc_ktls.c	Fri Nov 29 03:56:01 2019	(r355206)
+++ head/sys/kern/uipc_ktls.c	Fri Nov 29 06:25:03 2019	(r355207)
@@ -357,11 +357,7 @@ ktls_init(void *dummy __unused)
 
 	ktls_session_zone = uma_zcreate("ktls_session",
 	    sizeof(struct ktls_session),
-#ifdef INVARIANTS
-	    trash_ctor, trash_dtor, trash_init, trash_fini,
-#else
 	    NULL, NULL, NULL, NULL,
-#endif
 	    UMA_ALIGN_CACHE, 0);
 
 	/*