From nobody Thu Dec 09 19:24:20 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4D09418CFFE7; Thu, 9 Dec 2021 19:24:21 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J93r44QWrz4j03; Thu, 9 Dec 2021 19:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5FD9B4668; Thu, 9 Dec 2021 19:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B9JOKCf086913; Thu, 9 Dec 2021 19:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9JOKI8086912; Thu, 9 Dec 2021 19:24:20 GMT (envelope-from git) Date: Thu, 9 Dec 2021 19:24:20 GMT Message-Id: <202112091924.1B9JOKI8086912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 8ad5b9498ef4 - main - Revert "geom_bde: plug set-but-not-used vars" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ad5b9498ef42527cf9c0dd49dc27891ba1e0eaf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639077860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hd2jmpx0jMYCficV+r7hR1LjhGqBqwMXSU7emdvqUHo=; b=K3++a7U4Ls8FJCQB439pLSgsanbMAFm719t8Msp+K8ygZ33ojtdCADgJakCAauhlTz0NX/ r2oR/nRDgKf0xY1XJGDSY6bWnUpGPwrYNB20oZ+VYvvv5x5rAG6KsYaHxUGxf6SnnY2ds+ ZeInW4zM8OClACqxlZ9O3cv2AhfqxQwCyYGpplLO02Y54ioFWrdjyRMmuybnU6W+d+ftZe P1ykR04PWRjBehfGdRFtSBUJS1Ppb91T7c5JgckqeK53nJvPGRa/LnvyJl+LDrQM1Nx2tF f1JG7tkL4y13DoyvpRpM2E8yEk+yubVeekNOYKBCGfZCq1Ra8oGsgzx+7aabIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639077860; a=rsa-sha256; cv=none; b=CjTg4U85z8MNz+0CifcCSWzWBJuP4GIztKyy0RJEcVQxKKa43vFRxZLnZiPkyiRJ40lqaA r4La8HGrNaNVkfi38XH3m4/QyGdLDkR1ccPWb9i3ro9nGKTQgFJ82Uau2POXFgbZBGPY55 MbTnHC+eME0XoG51AIEVmPs8OdJ7Uwj8gVh52CaIx7LpK98ixHLEcZTkJrklhFrLj06j9B 2l5HOd82OgWVm/ILNi4SSKbZqbuH438uuynQzJewlqHXIfy1NuDE552KYboUzlE00gbXyg Y5QyztGXHtvAfx/kjsvsaediWWK8va0ILU+NjVXnfXUaVe2EXPh7tJUhirwB6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=8ad5b9498ef42527cf9c0dd49dc27891ba1e0eaf commit 8ad5b9498ef42527cf9c0dd49dc27891ba1e0eaf Author: Mateusz Guzik AuthorDate: 2021-12-09 19:23:05 +0000 Commit: Mateusz Guzik CommitDate: 2021-12-09 19:23:05 +0000 Revert "geom_bde: plug set-but-not-used vars" The commit at hand happens to break userspace build as the header ins included by sbin/gbde/gbde.c and the __diagused macro is not provided to userspace. Revert until this gets sorted out. This reverts commit 26e837e2d488cc3e484c88a511728e061205edc5. --- sys/geom/bde/g_bde.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/geom/bde/g_bde.h b/sys/geom/bde/g_bde.h index 76741a3e1ec5..3f36bb4281ae 100644 --- a/sys/geom/bde/g_bde.h +++ b/sys/geom/bde/g_bde.h @@ -176,7 +176,7 @@ void g_bde_worker(void *arg); static __inline void AES_init(cipherInstance *ci) { - int error __diagused; + int error; error = rijndael_cipherInit(ci, MODE_CBC, NULL); KASSERT(error > 0, ("rijndael_cipherInit %d", error)); @@ -185,7 +185,7 @@ AES_init(cipherInstance *ci) static __inline void AES_makekey(keyInstance *ki, int dir, u_int len, const void *key) { - int error __diagused; + int error; error = rijndael_makeKey(ki, dir, len, key); KASSERT(error > 0, ("rijndael_makeKey %d", error)); @@ -194,7 +194,7 @@ AES_makekey(keyInstance *ki, int dir, u_int len, const void *key) static __inline void AES_encrypt(cipherInstance *ci, keyInstance *ki, const void *in, void *out, u_int len) { - int error __diagused; + int error; error = rijndael_blockEncrypt(ci, ki, in, len * 8, out); KASSERT(error > 0, ("rijndael_blockEncrypt %d", error)); @@ -203,7 +203,7 @@ AES_encrypt(cipherInstance *ci, keyInstance *ki, const void *in, void *out, u_in static __inline void AES_decrypt(cipherInstance *ci, keyInstance *ki, const void *in, void *out, u_int len) { - int error __diagused; + int error; error = rijndael_blockDecrypt(ci, ki, in, len * 8, out); KASSERT(error > 0, ("rijndael_blockDecrypt %d", error));