diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 13:51:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 13:51:54 -0700 |
| commit | 07c8f3bfef161271786f368791f5fc33c7428964 (patch) | |
| tree | 57eacf11ce0208f22d083cfe69cd8b37e225ed9c /fs/notify/group.c | |
| parent | d77d1dbba95500d1b38cab98bf608ad46dce8374 (diff) | |
| parent | 2f02fd3fa13e51713b630164f8a8e5b42de8283b (diff) | |
Merge tag 'fsnotify_for_v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull fsnotify updates from Jan Kara:
"Several smaller fixes and cleanups for fsnotify subsystem"
* tag 'fsnotify_for_v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
fanotify: fix ignore mask logic for events on child and on dir
fanotify: don't write with size under sizeof(response)
fsnotify: Remove proc_fs.h include
fanotify: remove reference to fill_event_metadata()
fsnotify: add mutex destroy
fanotify: prefix should_merge()
fanotify: Replace zero-length array with flexible-array
inotify: Fix error return code assignment flow.
fsnotify: Add missing annotation for fsnotify_finish_user_wait() and for fsnotify_prepare_user_wait()
Diffstat (limited to 'fs/notify/group.c')
| -rw-r--r-- | fs/notify/group.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/notify/group.c b/fs/notify/group.c index 133f723aca07..a4a4b1c64d32 100644 --- a/fs/notify/group.c +++ b/fs/notify/group.c @@ -25,6 +25,7 @@ static void fsnotify_final_destroy_group(struct fsnotify_group *group) group->ops->free_group_priv(group); mem_cgroup_put(group->memcg); + mutex_destroy(&group->mark_mutex); kfree(group); } |