Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 45830
b: refs/heads/master
c: 863c470
h: refs/heads/master
v: v3
  • Loading branch information
Alexey Dobriyan authored and Linus Torvalds committed Jan 26, 2007
1 parent 562a87a commit 6f2e4b9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c633090e3105e779c97d4978e5e3d7d66b291cfb
refs/heads/master: 863c47028eb469c9e6c4e4287b01bea2bbf78766
8 changes: 5 additions & 3 deletions trunk/fs/proc/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,11 @@ static int mounts_open(struct inode *inode, struct file *file)

if (task) {
task_lock(task);
ns = task->nsproxy->mnt_ns;
if (ns)
get_mnt_ns(ns);
if (task->nsproxy) {
ns = task->nsproxy->mnt_ns;
if (ns)
get_mnt_ns(ns);
}
task_unlock(task);
put_task_struct(task);
}
Expand Down

0 comments on commit 6f2e4b9

Please sign in to comment.