diff options
| author | James Morris <james.l.morris@oracle.com> | 2013-01-07 12:06:43 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2013-01-07 12:06:43 +1100 |
| commit | cf9ce948f47640797bd19980e1d99c6d17d0bdc3 (patch) | |
| tree | 97ce168cf32ac88b9aa93408b0b681747416a504 /kernel/sysctl_binary.c | |
| parent | e93072374112db9dc86635934ee761249be28370 (diff) | |
| parent | d1c3ed669a2d452cacfb48c2d171a1f364dae2ed (diff) | |
Merge tag 'v3.8-rc2' into next
Sync to Linus' tree.
Linux 3.8-rc2
Diffstat (limited to 'kernel/sysctl_binary.c')
| -rw-r--r-- | kernel/sysctl_binary.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 65bdcf198d4e..5a6384450501 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c @@ -1344,7 +1344,7 @@ static ssize_t binary_sysctl(const int *name, int nlen, goto out_putname; } - mnt = current->nsproxy->pid_ns->proc_mnt; + mnt = task_active_pid_ns(current)->proc_mnt; file = file_open_root(mnt->mnt_root, mnt, pathname, flags); result = PTR_ERR(file); if (IS_ERR(file)) |