Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
* 'for-linus' of git://git.infradead.org/users/eparis/notify: fs/notify/inotify: decrement user inotify count on close
This commit is contained in:
@@ -296,12 +296,15 @@ static int inotify_fasync(int fd, struct file *file, int on)
|
|||||||
static int inotify_release(struct inode *ignored, struct file *file)
|
static int inotify_release(struct inode *ignored, struct file *file)
|
||||||
{
|
{
|
||||||
struct fsnotify_group *group = file->private_data;
|
struct fsnotify_group *group = file->private_data;
|
||||||
|
struct user_struct *user = group->inotify_data.user;
|
||||||
|
|
||||||
fsnotify_clear_marks_by_group(group);
|
fsnotify_clear_marks_by_group(group);
|
||||||
|
|
||||||
/* free this group, matching get was inotify_init->fsnotify_obtain_group */
|
/* free this group, matching get was inotify_init->fsnotify_obtain_group */
|
||||||
fsnotify_put_group(group);
|
fsnotify_put_group(group);
|
||||||
|
|
||||||
|
atomic_dec(&user->inotify_devs);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user