projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[linux-2.6-block.git]
/
fs
/
namei.c
diff --git
a/fs/namei.c
b/fs/namei.c
index 9cc91fb7f156541bd53243b35c2823bbf9ca1133..4e3fc58dae7227fbb24ce97b1d4404df31ec9445 100644
(file)
--- a/
fs/namei.c
+++ b/
fs/namei.c
@@
-1133,9
+1133,6
@@
static int follow_automount(struct path *path, struct nameidata *nd,
path->dentry->d_inode)
return -EISDIR;
- if (path->dentry->d_sb->s_user_ns != &init_user_ns)
- return -EACCES;
-
nd->total_link_count++;
if (nd->total_link_count >= 40)
return -ELOOP;