From nobody Mon Nov 29 22:05:32 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 C8BAC18C77EE; Mon, 29 Nov 2021 22:05:33 +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 4J2zth5fDhz3GQF; Mon, 29 Nov 2021 22:05:32 +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 5F80D2355; Mon, 29 Nov 2021 22:05:32 +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 1ATM5W7X075640; Mon, 29 Nov 2021 22:05:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ATM5WYJ075639; Mon, 29 Nov 2021 22:05:32 GMT (envelope-from git) Date: Mon, 29 Nov 2021 22:05:32 GMT Message-Id: <202111292205.1ATM5WYJ075639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 638c5fa8df1d - main - syscalls: normalize (get|set)rlimit 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 638c5fa8df1d3f2bf4c63c2923f592b0c9e63751 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638223532; 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=ZSBg5nHqsr4XNZpt+TyqhjZqZUpe9/LH6Zx/UAycUT0=; b=xVHUhBXkYyd4zkjQgGxJM49AUaEDlJJt+3655lNT+Ok8NDB+svVPcly9PzgdUhn6WzigYT cQcaLbXCNRAZ7Ho9FRxVMUWhclCtQoDusc5d+ljq1ZLhGVwG8X1JejgFSvRMFIBBv2p7im 0ul1GDo1t3/s8/XQ0DF8cF2buZZUYX65fGxiYP752hmSWCy48QRbYHOM4+ZYy9y2dP5yCO v9kAQuW9aS6Ysja0c7duA7xYwvzH89tQvKPjIqXJuisqmTtCe9l9s1ick4390Yudp1pFlq j93VhpkkjHnBgklHWMuXpXcIEPkKw5FZCt4pD8t4rK8+bX9Pecw0+BWwxdL3Lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638223532; a=rsa-sha256; cv=none; b=lOfwCw7rhMx68K6lnvdhbXHhUWn8Ng7hD4/S6oaM+6wH4lXAbxe/cDM3EAZgLHGMdYms6J U04ksVFO5EiQcVx7jfsdkndB4FMoPjFPrCajq52ywZbLzvHjBUjDsLLeJ6/2tZZD5fBaT9 7nGW2EtHRKxOX8XpUXJRA14QWM2tXHYcIQ05oNdDPQ7I7tBiR3qz3WqUJBj5t5HxCDmXS+ tTC0Zh4uH0GZQBfoXlKFkn7WtvR8PeXjDCUWuXQsSJaBhnJholQS1HzEjF/1GG1tzX1Bsf 6tKHS4twah/f8RtWpEPyDhJkWkbk0xWZdgUb37hVwIN4t0nrGDOcBlGlXTXYOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=638c5fa8df1d3f2bf4c63c2923f592b0c9e63751 commit 638c5fa8df1d3f2bf4c63c2923f592b0c9e63751 Author: Brooks Davis AuthorDate: 2021-11-29 22:02:59 +0000 Commit: Brooks Davis CommitDate: 2021-11-29 22:04:42 +0000 syscalls: normalize (get|set)rlimit Declare normal _args structs rather than going out of the way to declare ___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,