projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
[cascardo/linux.git]
/
fs
/
proc_namespace.c
diff --git
a/fs/proc_namespace.c
b/fs/proc_namespace.c
index
1a81373
..
73ca174
100644
(file)
--- a/
fs/proc_namespace.c
+++ b/
fs/proc_namespace.c
@@
-232,17
+232,15
@@
static int mounts_open_common(struct inode *inode, struct file *file,
if (!task)
goto err;
if (!task)
goto err;
-
rcu_read_lock(
);
- nsp = task
_nsproxy(task)
;
+
task_lock(task
);
+ nsp = task
->nsproxy
;
if (!nsp || !nsp->mnt_ns) {
if (!nsp || !nsp->mnt_ns) {
-
rcu_read_unlock(
);
+
task_unlock(task
);
put_task_struct(task);
goto err;
}
ns = nsp->mnt_ns;
get_mnt_ns(ns);
put_task_struct(task);
goto err;
}
ns = nsp->mnt_ns;
get_mnt_ns(ns);
- rcu_read_unlock();
- task_lock(task);
if (!task->fs) {
task_unlock(task);
put_task_struct(task);
if (!task->fs) {
task_unlock(task);
put_task_struct(task);