summaryrefslogtreecommitdiffstats
path: root/fs/notify/inotify
diff options
context:
space:
mode:
authorEric Paris2009-07-07 16:28:23 +0200
committerEric Paris2009-07-21 21:26:26 +0200
commit5549f7cdf84c02939fd368d0842aa2f472bb6e98 (patch)
treeca921e8ce50067a4d034eefbf686551215e8504e /fs/notify/inotify
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff)
downloadkernel-qcow2-linux-5549f7cdf84c02939fd368d0842aa2f472bb6e98.tar.gz
kernel-qcow2-linux-5549f7cdf84c02939fd368d0842aa2f472bb6e98.tar.xz
kernel-qcow2-linux-5549f7cdf84c02939fd368d0842aa2f472bb6e98.zip
inotify: drop user watch count when a watch is removed
The inotify rewrite forgot to drop the inotify watch use cound when a watch was removed. This means that a single inotify fd can only ever register a maximum of /proc/sys/fs/max_user_watches even if some of those had been freed. Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs/notify/inotify')
-rw-r--r--fs/notify/inotify/inotify_user.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index ff27a2965844..1a870f9157b3 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -404,6 +404,8 @@ skip_send_ignore:
/* removed from idr, drop that reference */
fsnotify_put_mark(entry);
+
+ atomic_dec(&group->inotify_data.user->inotify_watches);
}
/* ding dong the mark is dead */