From nobody Tue Oct 24 18:36:55 2023 X-Original-To: dev-commits-src-branches@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 4SFLPh0NnFz4yLqt; Tue, 24 Oct 2023 18:36:56 +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 4SFLPg6tlkz3Xn9; Tue, 24 Oct 2023 18:36:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172616; 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=cTGznOHKahjOyOaHN+7hlLcsbOM+zhTcm9ykrh8ioMY=; b=buqYFdYiRxPpbMiiwUMhlQE0c4wL7p97t1pKlvVeDxNXfPQhOvOYJHdxgaWC9wcmNftPC5 KdJTWe0n0ZuXFDtsQh2aMf6e6Be6mvuQR02dMCwCQalzbgRgvuA7iOUSmAvv7vgBeDTDpV rmmgIRegzTIDfk9xOD+ml6qbsLFFmFvsc4FHnvTJARXUmxJsaO0exhX2AfPrnmKeP1lkvy 3VJdbuuVscryYO0Hnj6xzbEQIT2lmmyw2mb8tmN6Ifse88iiGVN4jRsTZ9v068bty8Mfoj MFETx0nRBDSw1E7uCh8/8EZ/Xwnj4/pjsdJvCEBFWB4EyElbOfPfGYk5GQwctA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172616; a=rsa-sha256; cv=none; b=eyFhqfD+5ZpEQqUduCSR9zUtZpXJEJdhcQ16/joJLMDZpYqmOToJhVdXInWyZuuaR3SurL xqtgRJD2d4XHIhtR1C7IcZVV1+/g27Sr2AhVihTMOEA80B9iJg7a5bAPe+O/rT41d9bgst 3+sdcqoIw87ow06K1egCetPrfaddms/L6+JGcXgccefwJEyCEPDZFPPEO5YoXXtoGOa2eK prIWuo6BK7zfCPXuZLcQmPJN2ZIayD40xlbh3uN2CTCxQh9cve0OfmEFcsbxpb31+0cULB uIsKMxIZ+CfxDLWKx8EH4CX2zf7GmIWn5X9I827oo8YpGuh7SXuvpkhC+jn0Iw== 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=1698172616; 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=cTGznOHKahjOyOaHN+7hlLcsbOM+zhTcm9ykrh8ioMY=; b=F4xXv6/f3ssTM8g13Ax7eZ076Wp1315fF0h3UqXsUImuhtBZn/9Os6OD3+KbEtjBZyMAhU RLK09NiTFO/iVzAwbyYMZYW9mL+bm8VKc/fyq0/dgQt2pGXdZ9cCOEbgs+xVPiz/W0o3/i ug4//hltyIkB/KGuhK6YOve7ZxZ/+RvF0w4rJo7gpueMfWu+lD7GUPvBfiHH15lqR/oYKw Z+Z1Tqv+9ZoQlBi18/GwTotMH7ylqyUN8hzpC6jksyYfNH3DyEo0BD8pWSGDCZq+84usRT IdQ5yYEtHgfkhOFTn9TBmP/0DXVEyJ41jNwL4f7k7lBbTCUEpsgaPmNJKMqyQQ== 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 4SFLPg5zkBzZ2y; Tue, 24 Oct 2023 18:36:55 +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 39OIatTU087337; Tue, 24 Oct 2023 18:36:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIatX0087334; Tue, 24 Oct 2023 18:36:55 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:36:55 GMT Message-Id: <202310241836.39OIatX0087334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 83a00a92dab0 - stable/14 - Move kern_extattr_* prototypes to List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 83a00a92dab019a4f4cd413c2a2b79f861ec0788 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=83a00a92dab019a4f4cd413c2a2b79f861ec0788 commit 83a00a92dab019a4f4cd413c2a2b79f861ec0788 Author: John Baldwin AuthorDate: 2023-09-08 23:36:28 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:00:57 +0000 Move kern_extattr_* prototypes to All of the kern_* prototypes belong in this header. While here, sort the prototypes by function name. Reviewed by: dchagin Fixes: 6453d4240f6b vfs: Export exattr methods to reuse by Linuxulator Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41766 (cherry picked from commit 3555be0124a4f105c72d932f00071f332691e8cf) --- sys/kern/vfs_extattr.c | 1 + sys/sys/extattr.h | 22 ---------------------- sys/sys/syscallsubr.h | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index e178589067c1..dc1bbb58644b 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include diff --git a/sys/sys/extattr.h b/sys/sys/extattr.h index a6689c869c0c..a16ef238656f 100644 --- a/sys/sys/extattr.h +++ b/sys/sys/extattr.h @@ -62,33 +62,11 @@ #ifdef _KERNEL #include -enum uio_seg; -struct uio; struct thread; struct ucred; struct vnode; int extattr_check_cred(struct vnode *vp, int attrnamespace, struct ucred *cred, struct thread *td, accmode_t accmode); -int kern_extattr_set_path(struct thread *td, const char *path, - int attrnamespace, const char *attrname, void *data, - size_t nbytes, int follow, enum uio_seg pathseg); -int kern_extattr_set_fd(struct thread *td, int fd, int attrnamespace, - const char *attrname, void *data, size_t nbytes); -int kern_extattr_get_path(struct thread *td, const char *path, - int attrnamespace, const char *attrname, void *data, - size_t nbytes, int follow, enum uio_seg pathseg); -int kern_extattr_get_fd(struct thread *td, int fd, int attrnamespace, - const char *attrname, void *data, size_t nbytes); -int kern_extattr_delete_path(struct thread *td, const char *path, - int attrnamespace, const char *attrname, int follow, - enum uio_seg pathseg); -int kern_extattr_delete_fd(struct thread *td, int fd, int attrnamespace, - const char *attrname); -int kern_extattr_list_path(struct thread *td, const char *path, - int attrnamespace, struct uio *auiop, int follow, - enum uio_seg pathseg); -int kern_extattr_list_fd(struct thread *td, int fd, int attrnamespace, - struct uio *auiop); #else #include diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 8be860dc0fd4..0480eda2fca4 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -139,6 +139,26 @@ int kern_cpuset_setid(struct thread *td, cpuwhich_t which, int kern_dup(struct thread *td, u_int mode, int flags, int old, int new); int kern_execve(struct thread *td, struct image_args *args, struct mac *mac_p, struct vmspace *oldvmspace); +int kern_extattr_delete_fd(struct thread *td, int fd, int attrnamespace, + const char *attrname); +int kern_extattr_delete_path(struct thread *td, const char *path, + int attrnamespace, const char *attrname, int follow, + enum uio_seg pathseg); +int kern_extattr_get_fd(struct thread *td, int fd, int attrnamespace, + const char *attrname, void *data, size_t nbytes); +int kern_extattr_get_path(struct thread *td, const char *path, + int attrnamespace, const char *attrname, void *data, + size_t nbytes, int follow, enum uio_seg pathseg); +int kern_extattr_list_fd(struct thread *td, int fd, int attrnamespace, + struct uio *auiop); +int kern_extattr_list_path(struct thread *td, const char *path, + int attrnamespace, struct uio *auiop, int follow, + enum uio_seg pathseg); +int kern_extattr_set_fd(struct thread *td, int fd, int attrnamespace, + const char *attrname, void *data, size_t nbytes); +int kern_extattr_set_path(struct thread *td, const char *path, + int attrnamespace, const char *attrname, void *data, + size_t nbytes, int follow, enum uio_seg pathseg); int kern_fchmodat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, mode_t mode, int flag); int kern_fchownat(struct thread *td, int fd, const char *path,