Page MenuHomeFreeBSD
Files F174150902

D60173.diff
No OneTemporary
Actions

D60173.diff
View Options

diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -2043,13 +2043,13 @@
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
--- a/sys/kern/vfs_inotify.c
+++ b/sys/kern/vfs_inotify.c
@@ -921,8 +921,8 @@
}
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 @@
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 @@
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
--- a/sys/sys/inotify.h
+++ b/sys/sys/inotify.h
@@ -89,9 +89,9 @@
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);

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 1, 11:10 PM (12 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40029494
Default Alt Text
D60173.diff (2 KB)

Event Timeline