diff options
| author |   Keith Packard <keithp@keithp.com> | 2009-07-01 21:56:38 -0700 |
|---|---|---|
| committer |   Eric Paris <eparis@redhat.com> | 2009-07-02 08:23:00 -0400 |
| commit | bdae997f44535ac4ebe1e055ffe59eeee946f453 (patch) | |
| tree | ee17363d16d584551729ce99a4ac5a77ee8b13fa /fs/notify | |
| parent | kernel-doc: move ignoring kmemcheck (diff) | |
| download | linux-dev-bdae997f44535ac4ebe1e055ffe59eeee946f453.tar.xz linux-dev-bdae997f44535ac4ebe1e055ffe59eeee946f453.zip | |
fs/notify/inotify: decrement user inotify count on close
The per-user inotify_devs value is incremented each time a new file is
allocated, but never decremented. This led to inotify_init failing after a
limited number of calls.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs/notify')
| -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; } |