git: 8ad5b9498ef4 - main - Revert "geom_bde: plug set-but-not-used vars"

The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=8ad5b9498ef42527cf9c0dd49dc27891ba1e0eaf

commit 8ad5b9498ef42527cf9c0dd49dc27891ba1e0eaf
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2021-12-09 19:23:05 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
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));