Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 746a99a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5291a12f bdae997f

fs/notify/inotify/inotify_user.c

+3 −0
Original line number Diff line number Diff line
@@ -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)

{

	struct fsnotify_group *group = file->private_data;

	struct user_struct *user = group->inotify_data.user;



	fsnotify_clear_marks_by_group(group);



	/* free this group, matching get was inotify_init->fsnotify_obtain_group */

	fsnotify_put_group(group);



	atomic_dec(&user->inotify_devs);



	return 0;

}