diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-29 21:06:13 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-29 21:06:13 +0300 |
| commit | 3644286f6cbcea86f6fa4d308e7ac06bf2a3715a (patch) | |
| tree | d052231d1029d3e4f783c9b74b295eb07d194130 /include/linux/sched | |
| parent | 767fcbc80f63d7f08ff6c0858fe33583e6fdd327 (diff) | |
| parent | 59cda49ecf6c9a32fae4942420701b6e087204f6 (diff) | |
| download | linux-3644286f6cbcea86f6fa4d308e7ac06bf2a3715a.tar.xz | |
Merge tag 'fsnotify_for_v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull fsnotify updates from Jan Kara:
- support for limited fanotify functionality for unpriviledged users
- faster merging of fanotify events
- a few smaller fsnotify improvements
* tag 'fsnotify_for_v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
shmem: allow reporting fanotify events with file handles on tmpfs
fs: introduce a wrapper uuid_to_fsid()
fanotify_user: use upper_32_bits() to verify mask
fanotify: support limited functionality for unprivileged users
fanotify: configurable limits via sysfs
fanotify: limit number of event merge attempts
fsnotify: use hash table for faster events merge
fanotify: mix event info and pid into merge key hash
fanotify: reduce event objectid to 29-bit hash
fsnotify: allow fsnotify_{peek,remove}_first_event with empty queue
Diffstat (limited to 'include/linux/sched')
| -rw-r--r-- | include/linux/sched/user.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/sched/user.h b/include/linux/sched/user.h index a8ec3b6093fc..3632c5d6ec55 100644 --- a/include/linux/sched/user.h +++ b/include/linux/sched/user.h @@ -14,9 +14,6 @@ struct user_struct { refcount_t __count; /* reference count */ atomic_t processes; /* How many processes does this user have? */ atomic_t sigpending; /* How many pending signals does this user have? */ -#ifdef CONFIG_FANOTIFY - atomic_t fanotify_listeners; -#endif #ifdef CONFIG_EPOLL atomic_long_t epoll_watches; /* The number of file descriptors currently watched */ #endif |