From nobody Wed Sep 30 15:04:44 2026 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 4hvyy450Gzz6tf5b for ; Wed, 30 Sep 2026 15:04:44 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hvyy410k0z4L7y for ; Wed, 30 Sep 2026 15:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790780684; 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=UWKM0Jo03/MgJMccHoh9ahcG5b0E0HRCeJQMK07N8aM=; b=m2xeEO9VLb+O95AYNLkms3HxWxlMSmQJD3mBpMqkI8yzS66N89V6QDhalecsTOyjbti0wV fFPzo8klGmUmgTzqiaDEeB3hdJ/w3I6nrXGsd/i6mQDcbsxxzRarprB38BTnfKQNbMU7kb SSsukEits6WTS3T8mcVMc+sOO/fxPvIpiwjdGRXAFAmYnSiFkrWQiVTwDYS4+zYlzVul5Q 4PvhcxQRBfS3Min+sAYBN7/NxeWoGfTZvg9uQMkzzr9mA8Erdz2zV7S3BbBf45/l+k5uzJ goEHcR/NfIlOhYkEUXFJaVyyglK6MJ5ssqyYBt6/Zsqno++ziHOPRDiHzEaM8A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790780684; b=ensCBj+dK4DGW7F+nC3R3ok0OQjuBDH7Z3CzTZCan2KXtNlf015rI1gvyIBew+189aWI68 +Yml/n/vVxEwZ/W7MEqcPt9csMfhOaQs6xhzQQgY8YEyms7pdzBs6fKmoy8mB5qSrBJAv9 dRH/j437nPe50vek7PHs83nPQTflfAMhZPE3XB/hmHVAuxp75VQ8Y3RExqLuyXEO9yekws M5L/dFF7hNb0CpyUxtRaumleVpGO6OluarWwvaOZ2tZaa/W4EUHbVO5pNAIwq4GB1Z50FM C0IX89q7JQ/aFoANoOQDtvl6qJDoNV/PUi65IESNK0ssSvfmVVdEV2xLYDF4Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790780684; 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=UWKM0Jo03/MgJMccHoh9ahcG5b0E0HRCeJQMK07N8aM=; b=jtQoG7iOzONw9AAYxQFwZLJmLJhKDcud1XDt8HQ3adzi/nYijDF83OuLvTdqSdY0mAk6Cu /tpgx6z21ZDDFU4yu0OEaw0bwtD5ZAw28tQXsL19h0b+7oBXJYU6u6NR7ckyLHMVefTYWo GABwtp0zqPadmuZUIegGI4HI3pc+ORy6j13kE+4YZyRWSVbxaV7gaV5y78iRzSvxbQf5HG ajPHiDq4EEUgneDbvIAk3TMmErtBBy+15Iig2zkzc0xyZ4jKP82JObnXaBpkllvBKfRsUX /FubhF4ZQ0yim8qGOQMDWVWYzoNrYByq7TNof0/QedrKKwKYpWCDUvHpIT4nOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hvyy405M6zqp3 for ; Wed, 30 Sep 2026 15:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26553 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 15:04:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ea392ed9b901 - main - inotify: Move 'td' to the first argument of kern_inotify_* 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: ea392ed9b901789fe4d2cee2dedd91c7747a9677 Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 15:04:44 +0000 Message-Id: <6abd250c.26553.3e9f296e@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ea392ed9b901789fe4d2cee2dedd91c7747a9677 commit ea392ed9b901789fe4d2cee2dedd91c7747a9677 Author: John Baldwin AuthorDate: 2026-09-30 15:04:08 +0000 Commit: John Baldwin CommitDate: 2026-09-30 15:04:08 +0000 inotify: Move 'td' to the first argument of kern_inotify_* This is consistent with other system call helpers. Reviewed by: markj Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D60173 --- sys/compat/linux/linux_file.c | 6 +++--- sys/kern/vfs_inotify.c | 12 ++++++------ sys/sys/inotify.h | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 9a1f21d5feb7..023da9a24772 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -2043,13 +2043,13 @@ linux_inotify_add_watch(struct thread *td, args->mask); return (EINVAL); } - return (kern_inotify_add_watch(args->fd, AT_FDCWD, args->pathname, - args->mask, td)); + return (kern_inotify_add_watch(td, args->fd, AT_FDCWD, args->pathname, + args->mask)); } int linux_inotify_rm_watch(struct thread *td, struct linux_inotify_rm_watch_args *args) { - return (kern_inotify_rm_watch(args->fd, args->wd, td)); + return (kern_inotify_rm_watch(td, args->fd, args->wd)); } diff --git a/sys/kern/vfs_inotify.c b/sys/kern/vfs_inotify.c index bc8db76d848b..2cf13a7485eb 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -921,8 +921,8 @@ fget_inotify(struct thread *td, int fd, const cap_rights_t *needrightsp, } int -kern_inotify_add_watch(int fd, int dfd, const char *path, uint32_t mask, - struct thread *td) +kern_inotify_add_watch(struct thread *td, int fd, int dfd, const char *path, + uint32_t mask) { struct nameidata nd; struct file *fp; @@ -1002,12 +1002,12 @@ int sys_inotify_add_watch_at(struct thread *td, struct inotify_add_watch_at_args *uap) { - return (kern_inotify_add_watch(uap->fd, uap->dfd, uap->path, - uap->mask, td)); + return (kern_inotify_add_watch(td, uap->fd, uap->dfd, uap->path, + uap->mask)); } int -kern_inotify_rm_watch(int fd, uint32_t wd, struct thread *td) +kern_inotify_rm_watch(struct thread *td, int fd, uint32_t wd) { struct file *fp; struct inotify_softc *sc; @@ -1052,5 +1052,5 @@ kern_inotify_rm_watch(int fd, uint32_t wd, struct thread *td) int sys_inotify_rm_watch(struct thread *td, struct inotify_rm_watch_args *uap) { - return (kern_inotify_rm_watch(uap->fd, uap->wd, td)); + return (kern_inotify_rm_watch(td, uap->fd, uap->wd)); } diff --git a/sys/sys/inotify.h b/sys/sys/inotify.h index b8b4c67d9be2..dc36791e59d6 100644 --- a/sys/sys/inotify.h +++ b/sys/sys/inotify.h @@ -89,9 +89,9 @@ struct vnode; int inotify_create_file(struct thread *, struct file *, int, int *); void inotify_log(struct vnode *, const char *, size_t, int, __uint32_t); -int kern_inotify_rm_watch(int, uint32_t, struct thread *); -int kern_inotify_add_watch(int, int, const char *, uint32_t, - struct thread *); +int kern_inotify_rm_watch(struct thread *, int, uint32_t); +int kern_inotify_add_watch(struct thread *, int, int, const char *, + uint32_t); void vn_inotify(struct vnode *, struct vnode *, struct componentname *, int, uint32_t);