Auto merge with /home/aegl/GIT/linus

1 files changed, 4 insertions, 0 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index ff48815bd3a2..dec5827c7742 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -410,6 +410,10 @@ struct user_struct {
         atomic_t processes;     /* How many processes does this user have? */
         atomic_t files;         /* How many open files does this user have? */
         atomic_t sigpending;    /* How many pending signals does this user have? */
+#ifdef CONFIG_INOTIFY
+        atomic_t inotify_watches; /* How many inotify watches does this user have? */
+        atomic_t inotify_devs;  /* How many inotify devs does this user have opened? */
+#endif
         /* protected by mq_lock */
         unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */
         unsigned long locked_shm; /* How many pages of mlocked shm ? */