diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-03 01:54:07 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-03 01:54:07 +0200 |
| commit | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (patch) | |
| tree | 68b583b9653be99b43fe542de3f4b62819411b95 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff) | |
| parent | fs/notify/inotify: decrement user inotify count on close (diff) | |
| download | linux-746a99a5af60ee676afa2ba469ccd1373493c7e7.tar.xz linux-746a99a5af60ee676afa2ba469ccd1373493c7e7.zip | |
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
| -rw-r--r-- | fs/notify/inotify/inotify_user.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index ff231ad23895..ff27a2965844 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c @@ -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; } |