diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 13:23:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 13:23:29 -0800 |
| commit | db990385427c278eef56aac2e2588ec8b8cab5b4 (patch) | |
| tree | 3a8af82300f456626fefb7201a8cf216d32011c8 /fs/notify/fanotify/fanotify_user.c | |
| parent | d61c6a58ae30e80fb68925877cab06ad7a4ce41e (diff) | |
| parent | ac7b79fd190b02e7151bc7d2b9da692f537657f3 (diff) | |
| download | linux-db990385427c278eef56aac2e2588ec8b8cab5b4.tar.bz2 | |
Merge tag 'fsnotify_for_v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull fsnotify update from Jan Kara:
"Make inotify groups be charged against appropriate memcgs"
* tag 'fsnotify_for_v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
inotify, memcg: account inotify instances to kmemcg
Diffstat (limited to 'fs/notify/fanotify/fanotify_user.c')
| -rw-r--r-- | fs/notify/fanotify/fanotify_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index dcab112e1f00..b78dd1f88f7c 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -976,7 +976,7 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags) f_flags |= O_NONBLOCK; /* fsnotify_alloc_group takes a ref. Dropped in fanotify_release */ - group = fsnotify_alloc_group(&fanotify_fsnotify_ops); + group = fsnotify_alloc_user_group(&fanotify_fsnotify_ops); if (IS_ERR(group)) { free_uid(user); return PTR_ERR(group); |