From nobody Tue Mar 19 23:15:58 2024
X-Original-To: dev-commits-src-main@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 4Tzndq2y18z5FkGK;
Tue, 19 Mar 2024 23:15:59 +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 4Tzndq0pfPz4JFm;
Tue, 19 Mar 2024 23:15:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1710890159;
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=vs71L0QByNsQ3pngJHy9QXYAAQnHj2/XSICce6upD7s=;
b=GpWQNPc0h+muDx7ZJecx5U4FlJsVzRuE79HU0AUK2YsTc7Yf/FHWonsqgoS/zIzZz5aSYS
Kx35vHgFQPth0g9YVd/LowdZvg7WFfV32x2bc7J9zzuvBapJbgbb9a/TBsgd2alAqP4XdF
JrpjtIWn4DyLOPTaGknZQmLrXvzl5eGZkoH7z9P1huGNQ7Au6LhadnHueEc210DHCPo4QG
/lVgildjhNSZcDdnL8UpyGvlqZpBQdcz8BUBvVdq3lRYeno2GKtUlnarsj/jHb84EhA7th
ZA7BKFJ2z4q6wDUn+OcFQu5Q8GLWGX7SH/WOT9NUAXSdj9kWKw25hvWjbduJ8A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710890159; a=rsa-sha256; cv=none;
b=VKq0P+Xdm4T7u91t4htC56oOfo49v9CcckXfGMQAVfgk2c9awqUnu7tumGO7nE/aTzPOm/
XZDkv8zYbRucw8XQCbXerOHcND8Y59k0m4eMj3iNg0Ly5JsUOamlH/GwQY0IO8AACyKD2W
n6t+hG7meFMLwTfYhQA7XHaEtuIK0TTRgFC1hA/SSqQA4jRTC4kTcEZwesRWli/x52begz
MEc5iLpVjnXZ/oV9ayozYwCUL3GRXJwD0uQhtGCjB6U41AijVBqa5hSwrd7fSQ0SnocLAV
gShoe9D+VlFSYp2l3mrYVQrcwJD8mCFBlw0dk8ngby9NDQ5JS0Y2qPJMLXjnJA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1710890159;
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=vs71L0QByNsQ3pngJHy9QXYAAQnHj2/XSICce6upD7s=;
b=WQImV96a928gB06hCgGDUl18Eu0WLrfjJ6HgnxkZ/zPElG172V0rtY06u7ApMzqsJJ47s3
VePnZyfmkB3hp7Bil4vEqyKFic4lUTieVq2rtF7KWQXYFxED45npQnJ6LmcSZjPG64eZFs
0Yf32LvCBG67uFAXeQCrqijCWeb+2NUjK6R4PTj/22UHdH9bHxM7YSFtWCSdHPlSOaXFYP
Rd64IrJby9xY31Zx4U9foHh/FBIGGKOxuxbskwQ44de4aI++xbesSr6cWpRqi34qrqVQTN
cty2ftSzs3pWNVYz/Y9bg+9zGc/wnkXjvUEbgAjmsEN1mYe25naZ5naZPLTH3g==
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 4Tzndq0KT6zRWK;
Tue, 19 Mar 2024 23:15:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42JNFwoA079275;
Tue, 19 Mar 2024 23:15:58 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JNFwvM079272;
Tue, 19 Mar 2024 23:15:58 GMT
(envelope-from git)
Date: Tue, 19 Mar 2024 23:15:58 GMT
Message-Id: <202403192315.42JNFwvM079272@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Brooks Davis <brooks@FreeBSD.org>
Subject: git: 55513a1b6e4b - main - sys/acl.h: move main typedefs
to sys/_types.h
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-main@freebsd.org
X-BeenThere: dev-commits-src-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: brooks
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 55513a1b6e4b46cc5f19bbf35980ff0db874a93b
Auto-Submitted: auto-generated
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=55513a1b6e4b46cc5f19bbf35980ff0db874a93b
commit 55513a1b6e4b46cc5f19bbf35980ff0db874a93b
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-03-18 21:45:42 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-03-19 23:13:26 +0000
sys/acl.h: move main typedefs to sys/_types.h
Make __ prefixed versions available without the pollution of sys/acl.h
(and by extension sys/param.h).
Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D44382
---
sys/sys/_types.h | 9 +++++++++
sys/sys/acl.h | 14 +++++++-------
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/sys/sys/_types.h b/sys/sys/_types.h
index 769451299b19..c84b84edd2b8 100644
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
@@ -187,6 +187,15 @@ typedef struct {
#endif
} __max_align_t;
+/* Types for sys/acl.h */
+typedef __uint32_t __acl_tag_t;
+typedef __uint32_t __acl_perm_t;
+typedef __uint16_t __acl_entry_type_t;
+typedef __uint16_t __acl_flag_t;
+typedef __uint32_t __acl_type_t;
+typedef __uint32_t *__acl_permset_t;
+typedef __uint16_t *__acl_flagset_t;
+
typedef __uint64_t __dev_t; /* device number */
typedef __uint32_t __fixpt_t; /* fixed point number */
diff --git a/sys/sys/acl.h b/sys/sys/acl.h
index f679808dceca..66517cff543e 100644
--- a/sys/sys/acl.h
+++ b/sys/sys/acl.h
@@ -44,13 +44,13 @@
* POSIX.1e and NFSv4 ACL types and related constants.
*/
-typedef uint32_t acl_tag_t;
-typedef uint32_t acl_perm_t;
-typedef uint16_t acl_entry_type_t;
-typedef uint16_t acl_flag_t;
-typedef int acl_type_t;
-typedef int *acl_permset_t;
-typedef uint16_t *acl_flagset_t;
+typedef __acl_tag_t acl_tag_t;
+typedef __acl_perm_t acl_perm_t;
+typedef __acl_entry_type_t acl_entry_type_t;
+typedef __acl_flag_t acl_flag_t;
+typedef __acl_type_t acl_type_t;
+typedef __acl_permset_t acl_permset_t;
+typedef __acl_flagset_t acl_flagset_t;
/*
* With 254 entries, "struct acl_t_struct" is exactly one 4kB page big.