diff options
| author | Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-07-13 10:45:00 +0200 | 
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-13 10:45:00 +0200 | 
| commit | 1b3035b7fcc72b6b36f2a3634dad832eb2453ce8 (patch) | |
| tree | 728174d72943cc9b981a5843553551df62eddc41 /include/linux/sched.h | |
| parent | a98a5d04f400ad112e59cadd739dbabf89417e60 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge with rsync://fileserver/linux
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 4 | 
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 ? */  | 
