git: 638c5fa8df1d - main - syscalls: normalize (get|set)rlimit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 29 Nov 2021 22:05:32 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=638c5fa8df1d3f2bf4c63c2923f592b0c9e63751
commit 638c5fa8df1d3f2bf4c63c2923f592b0c9e63751
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2021-11-29 22:02:59 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2021-11-29 22:04:42 +0000
syscalls: normalize (get|set)rlimit
Declare normal <foo>_args structs rather than going out of the way
to declare __<foo>_args.
Reviewed by: kib, imp
---
sys/kern/kern_resource.c | 8 ++++----
sys/kern/syscalls.master | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index b556d4fded51..5b90148ccf99 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -592,13 +592,13 @@ ogetrlimit(struct thread *td, struct ogetrlimit_args *uap)
#endif /* COMPAT_43 */
#ifndef _SYS_SYSPROTO_H_
-struct __setrlimit_args {
+struct setrlimit_args {
u_int which;
struct rlimit *rlp;
};
#endif
int
-sys_setrlimit(struct thread *td, struct __setrlimit_args *uap)
+sys_setrlimit(struct thread *td, struct setrlimit_args *uap)
{
struct rlimit alim;
int error;
@@ -782,14 +782,14 @@ kern_proc_setrlimit(struct thread *td, struct proc *p, u_int which,
}
#ifndef _SYS_SYSPROTO_H_
-struct __getrlimit_args {
+struct getrlimit_args {
u_int which;
struct rlimit *rlp;
};
#endif
/* ARGSUSED */
int
-sys_getrlimit(struct thread *td, struct __getrlimit_args *uap)
+sys_getrlimit(struct thread *td, struct getrlimit_args *uap)
{
struct rlimit rlim;
int error;
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 6e89f2c313ea..cedadd9b94bf 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1166,13 +1166,13 @@
u_int which,
_Out_ struct rlimit *rlp
);
- } getrlimit __getrlimit_args int
+ }
195 AUE_SETRLIMIT STD|CAPENABLED {
int setrlimit(
u_int which,
_In_ struct rlimit *rlp
);
- } setrlimit __setrlimit_args int
+ }
196 AUE_GETDIRENTRIES COMPAT11|CAPENABLED {
int getdirentries(
int fd,