Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

[linux-2.6] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index 734575d55769bf5924ff305ffe77be86dda10033..89e562feb1b10829ec3d689eb969f670868be686 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -120,6 +120,10 @@ struct user_struct * alloc_uid(uid_t uid)
                atomic_set(&new->processes, 0);
                atomic_set(&new->files, 0);
                atomic_set(&new->sigpending, 0);
+#ifdef CONFIG_INOTIFY
+               atomic_set(&new->inotify_watches, 0);
+               atomic_set(&new->inotify_devs, 0);
+#endif
 
                new->mq_bytes = 0;
                new->locked_shm = 0;