From owner-svn-src-stable@freebsd.org Mon Apr 16 00:18:58 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A67CF9A855; Mon, 16 Apr 2018 00:18:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 17D6D797AA; Mon, 16 Apr 2018 00:18:58 +0000 (UTC) (envelope-from kevans@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 EC86B15FEB; Mon, 16 Apr 2018 00:18:57 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3G0Ivmb010057; Mon, 16 Apr 2018 00:18:57 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3G0IvuL010054; Mon, 16 Apr 2018 00:18:57 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201804160018.w3G0IvuL010054@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 16 Apr 2018 00:18:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r332520 - in stable/11: share/man/man4 sys/conf sys/geom X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11: share/man/man4 sys/conf sys/geom X-SVN-Commit-Revision: 332520 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Apr 2018 00:18:58 -0000 Author: kevans Date: Mon Apr 16 00:18:57 2018 New Revision: 332520 URL: https://svnweb.freebsd.org/changeset/base/332520 Log: geom_aes: Provide some deprecation notices This is a direct commit to stable/11, due to having already been removed in head. Modified: stable/11/share/man/man4/geom.4 stable/11/sys/conf/NOTES stable/11/sys/geom/geom_aes.c Modified: stable/11/share/man/man4/geom.4 ============================================================================== --- stable/11/share/man/man4/geom.4 Mon Apr 16 00:12:03 2018 (r332519) +++ stable/11/share/man/man4/geom.4 Mon Apr 16 00:18:57 2018 (r332520) @@ -41,7 +41,6 @@ .Nm GEOM .Nd "modular disk I/O request transformation framework" .Sh SYNOPSIS -.Cd options GEOM_AES .Cd options GEOM_BDE .Cd options GEOM_CACHE .Cd options GEOM_CONCAT @@ -450,6 +449,7 @@ Dump contents of gctl requests. .Pp The following options have been deprecated and will be removed in .Fx 12 : +.Cd GEOM_AES , .Cd GEOM_BSD , .Cd GEOM_FOX , .Cd GEOM_MBR , Modified: stable/11/sys/conf/NOTES ============================================================================== --- stable/11/sys/conf/NOTES Mon Apr 16 00:12:03 2018 (r332519) +++ stable/11/sys/conf/NOTES Mon Apr 16 00:18:57 2018 (r332520) @@ -145,7 +145,7 @@ options INCLUDE_CONFIG_FILE # Include this file i options BOOTVERBOSE=1 options BOOTHOWTO=RB_MULTIPLE -options GEOM_AES # Don't use, use GEOM_BDE +options GEOM_AES # Don't use, use GEOM_BDE (obsolete, gone in 12) options GEOM_BDE # Disk encryption. options GEOM_BSD # BSD disklabels (obsolete, gone in 12) options GEOM_CACHE # Disk cache. Modified: stable/11/sys/geom/geom_aes.c ============================================================================== --- stable/11/sys/geom/geom_aes.c Mon Apr 16 00:12:03 2018 (r332519) +++ stable/11/sys/geom/geom_aes.c Mon Apr 16 00:18:57 2018 (r332520) @@ -67,6 +67,7 @@ static const u_char *aes_magic = "<> static const u_char *aes_magic_random = "<>"; static const u_char *aes_magic_test = "<>"; +static int g_aes_once; struct g_aes_softc { enum { @@ -352,8 +353,14 @@ g_aes_taste(struct g_class *mp, struct g_provider *pp, if (buf) g_free(buf); g_access(cp, -1, 0, 0); - if (gp->softc != NULL) + if (gp->softc != NULL) { + if (!g_aes_once) { + g_aes_once = 1; + printf("WARNING: geom_aes (geom %s) is deprecated.", + gp->name); + } return (gp); + } g_detach(cp); g_destroy_consumer(cp); g_destroy_geom(gp);