diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /fs/proc/base.c | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 8df27401d292..795319c54f72 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -442,7 +442,8 @@ static int mountstats_open(struct inode *inode, struct file *file) | |||
| 442 | 442 | ||
| 443 | if (task) { | 443 | if (task) { |
| 444 | task_lock(task); | 444 | task_lock(task); |
| 445 | namespace = task->nsproxy->namespace; | 445 | if (task->nsproxy) |
| 446 | namespace = task->nsproxy->namespace; | ||
| 446 | if (namespace) | 447 | if (namespace) |
| 447 | get_namespace(namespace); | 448 | get_namespace(namespace); |
| 448 | task_unlock(task); | 449 | task_unlock(task); |