The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=d4ead7edbbfe7f84ba57a28685e09241433fa380
commit d4ead7edbbfe7f84ba57a28685e09241433fa380
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-05-12 19:40:45 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-07-04 14:42:33 +0000
inotify: Regenerate syscall definitions
Sponsored by: Klara, Inc.
---
lib/libsys/_libsys.h | 4 ++
lib/libsys/syscalls.map | 4 ++
sys/compat/freebsd32/freebsd32_syscall.h | 4 +-
sys/compat/freebsd32/freebsd32_syscalls.c | 2 +
sys/compat/freebsd32/freebsd32_sysent.c | 2 +
sys/compat/freebsd32/freebsd32_systrace_args.c | 60 ++++++++++++++++++++++++++
sys/kern/init_sysent.c | 2 +
sys/kern/syscalls.c | 2 +
sys/kern/systrace_args.c | 60 ++++++++++++++++++++++++++
sys/sys/syscall.h | 4 +-
sys/sys/syscall.mk | 4 +-
sys/sys/sysproto.h | 14 ++++++
12 files changed, 159 insertions(+), 3 deletions(-)
diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h
index e2a8f2253814..1799906eb885 100644
--- a/lib/libsys/_libsys.h
+++ b/lib/libsys/_libsys.h
@@ -466,6 +466,8 @@ typedef int (__sys_getrlimitusage_t)(u_int, int, rlim_t *);
typedef int (__sys_fchroot_t)(int);
typedef int (__sys_setcred_t)(u_int, const struct setcred *, size_t);
typedef int (__sys_exterrctl_t)(u_int, u_int, void *);
+typedef int (__sys_inotify_add_watch_at_t)(int, int, const char *, uint32_t);
+typedef int (__sys_inotify_rm_watch_t)(int, int);
void __sys_exit(int rval);
int __sys_fork(void);
@@ -868,6 +870,8 @@ int __sys_getrlimitusage(u_int which, int flags, rlim_t *
res);
int __sys_fchroot(int fd);
int __sys_setcred(u_int flags, const struct setcred * wcred, size_t size);
int __sys_exterrctl(u_int op, u_int flags, void * ptr);
+int __sys_inotify_add_watch_at(int fd, int dfd, const char * path, uint32_t
mask);
+int __sys_inotify_rm_watch(int fd, int wd);
__END_DECLS
#endif /* __LIBSYS_H_ */
diff --git a/lib/libsys/syscalls.map b/lib/libsys/syscalls.map
index 51be88203c17..69fce2ea7c63 100644
--- a/lib/libsys/syscalls.map
+++ b/lib/libsys/syscalls.map
@@ -809,4 +809,8 @@ FBSDprivate_1.0 {
__sys_setcred;
_exterrctl;
__sys_exterrctl;
+ _inotify_add_watch_at;
+ __sys_inotify_add_watch_at;
+ _inotify_rm_watch;
+ __sys_inotify_rm_watch;
};
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h
b/sys/compat/freebsd32/freebsd32_syscall.h
index eaa086188b5f..8d2748098c00 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -511,4 +511,6 @@
#define FREEBSD32_SYS_fchroot 590
#define FREEBSD32_SYS_freebsd32_setcred 591
#define FREEBSD32_SYS_exterrctl 592
-#define FREEBSD32_SYS_MAXSYSCALL 593
+#define FREEBSD32_SYS_inotify_add_watch_at 593
+#define FREEBSD32_SYS_inotify_rm_watch 594
+#define FREEBSD32_SYS_MAXSYSCALL 595
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c
b/sys/compat/freebsd32/freebsd32_syscalls.c
index 989f32a5c6f0..bda373268cc5 100644
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -598,4 +598,6 @@ const char *freebsd32_syscallnames[] = {
"fchroot", /* 590 = fchroot */
"freebsd32_setcred", /* 591 = freebsd32_setcred */
"exterrctl", /* 592 = exterrctl */
+ "inotify_add_watch_at", /* 593 = inotify_add_watch_at */
+ "inotify_rm_watch", /* 594 = inotify_rm_watch */
};
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c
b/sys/compat/freebsd32/freebsd32_sysent.c
index 476fe2ac3f80..3718a1b0c8ee 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -660,4 +660,6 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = AS(fchroot_args), .sy_call = (sy_call_t *)sys_fchroot,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
590 = fchroot */
{ .sy_narg = AS(freebsd32_setcred_args), .sy_call = (sy_call_t
*)freebsd32_setcred, .sy_auevent = AUE_SETCRED, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 591 = freebsd32_setcred */
{ .sy_narg = AS(exterrctl_args), .sy_call = (sy_call_t *)sys_exterrctl,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 592
= exterrctl */
+ { .sy_narg = AS(inotify_add_watch_at_args), .sy_call = (sy_call_t
*)sys_inotify_add_watch_at, .sy_auevent = AUE_INOTIFY, .sy_flags =
SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 593 =
inotify_add_watch_at */
+ { .sy_narg = AS(inotify_rm_watch_args), .sy_call = (sy_call_t
*)sys_inotify_rm_watch, .sy_auevent = AUE_INOTIFY, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 594 = inotify_rm_watch */
};
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c
b/sys/compat/freebsd32/freebsd32_systrace_args.c
index cf08938cd5de..37564a737a62 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -3395,6 +3395,24 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
*n_args = 3;
break;
}
+ /* inotify_add_watch_at */
+ case 593: {
+ struct inotify_add_watch_at_args *p = params;
+ iarg[a++] = p->fd; /* int */
+ iarg[a++] = p->dfd; /* int */
+ uarg[a++] = (intptr_t)p->path; /* const char * */
+ uarg[a++] = p->mask; /* uint32_t */
+ *n_args = 4;
+ break;
+ }
+ /* inotify_rm_watch */
+ case 594: {
+ struct inotify_rm_watch_args *p = params;
+ iarg[a++] = p->fd; /* int */
+ iarg[a++] = p->wd; /* int */
+ *n_args = 2;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -9172,6 +9190,38 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
};
break;
+ /* inotify_add_watch_at */
+ case 593:
+ switch (ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ case 2:
+ p = "userland const char *";
+ break;
+ case 3:
+ p = "uint32_t";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* inotify_rm_watch */
+ case 594:
+ switch (ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
default:
break;
};
@@ -11070,6 +11120,16 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* inotify_add_watch_at */
+ case 593:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* inotify_rm_watch */
+ case 594:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
default:
break;
};
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index a48a513aa3b5..34e71a0665ed 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -659,4 +659,6 @@ struct sysent sysent[] = {
{ .sy_narg = AS(fchroot_args), .sy_call = (sy_call_t *)sys_fchroot,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
590 = fchroot */
{ .sy_narg = AS(setcred_args), .sy_call = (sy_call_t *)sys_setcred,
.sy_auevent = AUE_SETCRED, .sy_flags = SYF_CAPENABLED, .sy_thrcnt =
SY_THR_STATIC }, /* 591 = setcred */
{ .sy_narg = AS(exterrctl_args), .sy_call = (sy_call_t *)sys_exterrctl,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 592
= exterrctl */
+ { .sy_narg = AS(inotify_add_watch_at_args), .sy_call = (sy_call_t
*)sys_inotify_add_watch_at, .sy_auevent = AUE_INOTIFY, .sy_flags =
SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 593 =
inotify_add_watch_at */
+ { .sy_narg = AS(inotify_rm_watch_args), .sy_call = (sy_call_t
*)sys_inotify_rm_watch, .sy_auevent = AUE_INOTIFY, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 594 = inotify_rm_watch */
};
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index fa36cc824078..90a4f3a7dad8 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -598,4 +598,6 @@ const char *syscallnames[] = {
"fchroot", /* 590 = fchroot */
"setcred", /* 591 = setcred */
"exterrctl", /* 592 = exterrctl */
+ "inotify_add_watch_at", /* 593 = inotify_add_watch_at */
+ "inotify_rm_watch", /* 594 = inotify_rm_watch */
};
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c
index 15789d3eb5fa..90b21616a558 100644
--- a/sys/kern/systrace_args.c
+++ b/sys/kern/systrace_args.c
@@ -3482,6 +3482,24 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
*n_args = 3;
break;
}
+ /* inotify_add_watch_at */
+ case 593: {
+ struct inotify_add_watch_at_args *p = params;
+ iarg[a++] = p->fd; /* int */
+ iarg[a++] = p->dfd; /* int */
+ uarg[a++] = (intptr_t)p->path; /* const char * */
+ uarg[a++] = p->mask; /* uint32_t */
+ *n_args = 4;
+ break;
+ }
+ /* inotify_rm_watch */
+ case 594: {
+ struct inotify_rm_watch_args *p = params;
+ iarg[a++] = p->fd; /* int */
+ iarg[a++] = p->wd; /* int */
+ *n_args = 2;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -9317,6 +9335,38 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
};
break;
+ /* inotify_add_watch_at */
+ case 593:
+ switch (ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ case 2:
+ p = "userland const char *";
+ break;
+ case 3:
+ p = "uint32_t";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* inotify_rm_watch */
+ case 594:
+ switch (ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
default:
break;
};
@@ -11305,6 +11355,16 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* inotify_add_watch_at */
+ case 593:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* inotify_rm_watch */
+ case 594:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
default:
break;
};
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 68406a2dfc29..eec923d0b82e 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -529,4 +529,6 @@
#define SYS_fchroot 590
#define SYS_setcred 591
#define SYS_exterrctl 592
-#define SYS_MAXSYSCALL 593
+#define SYS_inotify_add_watch_at 593
+#define SYS_inotify_rm_watch 594
+#define SYS_MAXSYSCALL 595
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index 9a90a63f35a3..547242a73277 100644
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -434,4 +434,6 @@ MIASM = \
getrlimitusage.o \
fchroot.o \
setcred.o \
- exterrctl.o
+ exterrctl.o \
+ inotify_add_watch_at.o \
+ inotify_rm_watch.o
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 94da81c84d25..94b5a0a7a95e 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -1891,6 +1891,16 @@ struct exterrctl_args {
char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)];
char ptr_l_[PADL_(void *)]; void * ptr; char ptr_r_[PADR_(void *)];
};
+struct inotify_add_watch_at_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char dfd_l_[PADL_(int)]; int dfd; char dfd_r_[PADR_(int)];
+ char path_l_[PADL_(const char *)]; const char * path; char
path_r_[PADR_(const char *)];
+ char mask_l_[PADL_(uint32_t)]; uint32_t mask; char
mask_r_[PADR_(uint32_t)];
+};
+struct inotify_rm_watch_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char wd_l_[PADL_(int)]; int wd; char wd_r_[PADR_(int)];
+};
int sys_exit(struct thread *, struct exit_args *);
int sys_fork(struct thread *, struct fork_args *);
int sys_read(struct thread *, struct read_args *);
@@ -2293,6 +2303,8 @@ int sys_getrlimitusage(struct thread *, struct
getrlimitusage_args *);
int sys_fchroot(struct thread *, struct fchroot_args *);
int sys_setcred(struct thread *, struct setcred_args *);
int sys_exterrctl(struct thread *, struct exterrctl_args *);
+int sys_inotify_add_watch_at(struct thread *, struct
inotify_add_watch_at_args *);
+int sys_inotify_rm_watch(struct thread *, struct inotify_rm_watch_args *);
#ifdef COMPAT_43
@@ -3275,6 +3287,8 @@ int freebsd13_swapoff(struct thread *, struct
freebsd13_swapoff_args *);
#define SYS_AUE_fchroot AUE_NULL
#define SYS_AUE_setcred AUE_SETCRED
#define SYS_AUE_exterrctl AUE_NULL
+#define SYS_AUE_inotify_add_watch_at AUE_INOTIFY
+#define SYS_AUE_inotify_rm_watch AUE_INOTIFY
#undef PAD_
#undef PADL_
