diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 09:47:49 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 09:47:49 +0100 |
| commit | 044a500e46742d39d22f1781cfb64ba93b463e39 (patch) | |
| tree | b0313211ea7ba26b90c1083ade0e4c9f486b87db /fs/proc/array.c | |
| parent | f6098cf449b81c14a51e48dd22ae47d03126a1de (diff) | |
| parent | 6c0741fbdee5bd0f8ed13ac287c4ab18e8ba7d83 (diff) | |
| download | linux-next-044a500e46742d39d22f1781cfb64ba93b463e39.tar.gz | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | fs/proc/array.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index d88d518d30f6..d84eecacbeaf 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -74,6 +74,7 @@ #include <linux/file.h> #include <linux/times.h> #include <linux/cpuset.h> +#include <linux/rcupdate.h> #include <asm/uaccess.h> #include <asm/pgtable.h> @@ -180,12 +181,14 @@ static inline char * task_state(struct task_struct *p, char *buffer) p->gid, p->egid, p->sgid, p->fsgid); read_unlock(&tasklist_lock); task_lock(p); + rcu_read_lock(); if (p->files) fdt = files_fdtable(p->files); buffer += sprintf(buffer, "FDSize:\t%d\n" "Groups:\t", fdt ? fdt->max_fds : 0); + rcu_read_unlock(); group_info = p->group_info; get_group_info(group_info); |